Changeset 220069 in webkit for trunk/Source/JavaScriptCore/API/JSContext.mm

Timestamp:

Jul 31, 2017, 9:32:16 AM (8 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r220060.

This broke our internal builds. Contact reviewer of patch for
more information.

Reverted changeset:

"Merge WTFThreadData to Thread::current"
​https://bugs.webkit.org/show_bug.cgi?id=174716
​http://trac.webkit.org/changeset/220060

File:

• trunk/Source/JavaScriptCore/API/JSContext.mm (modified) (6 diffs)

trunk/Source/JavaScriptCore/API/JSContext.mm

@@ -142 +142 @@
 + (JSContext *)currentContext
 {
-    Thread& thread = Thread::current();
-    CallbackData *entry = (CallbackData *)thread.m_apiData;
+    WTFThreadData& threadData = wtfThreadData();
+    CallbackData *entry = (CallbackData *)threadData.m_apiData;
     return entry ? entry->context : nil;
 }
@@ -149 +149 @@
 + (JSValue *)currentThis
 {
-    Thread& thread = Thread::current();
-    CallbackData *entry = (CallbackData *)thread.m_apiData;
+    WTFThreadData& threadData = wtfThreadData();
+    CallbackData *entry = (CallbackData *)threadData.m_apiData;
     if (!entry)
         return nil;
@@ -158 +158 @@
 + (JSValue *)currentCallee
 {
-    Thread& thread = Thread::current();
-    CallbackData *entry = (CallbackData *)thread.m_apiData;
+    WTFThreadData& threadData = wtfThreadData();
+    CallbackData *entry = (CallbackData *)threadData.m_apiData;
     if (!entry)
         return nil;
@@ -167 +167 @@
 + (NSArray *)currentArguments
 {
-    Thread& thread = Thread::current();
-    CallbackData *entry = (CallbackData *)thread.m_apiData;
+    WTFThreadData& threadData = wtfThreadData();
+    CallbackData *entry = (CallbackData *)threadData.m_apiData;
 
     if (!entry)
@@ -295 +295 @@
 - (void)beginCallbackWithData:(CallbackData *)callbackData calleeValue:(JSValueRef)calleeValue thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments
 {
-    Thread& thread = Thread::current();
+    WTFThreadData& threadData = wtfThreadData();
     [self retain];
-    CallbackData *prevStack = (CallbackData *)thread.m_apiData;
+    CallbackData *prevStack = (CallbackData *)threadData.m_apiData;
     *callbackData = (CallbackData){ prevStack, self, [self.exception retain], calleeValue, thisValue, argumentCount, arguments, nil };
-    thread.m_apiData = callbackData;
+    threadData.m_apiData = callbackData;
     self.exception = nil;
 }
@@ -305 +305 @@
 - (void)endCallbackWithData:(CallbackData *)callbackData
 {
-    Thread& thread = Thread::current();
+    WTFThreadData& threadData = wtfThreadData();
     self.exception = callbackData->preservedException;
     [callbackData->preservedException release];
     [callbackData->currentArguments release];
-    thread.m_apiData = callbackData->next;
+    threadData.m_apiData = callbackData->next;
     [self release];
 }