Changeset 263580 in webkit

Timestamp:

Jun 26, 2020 1:52:54 PM (4 years ago)

Author:

ggaren@apple.com

Message:

Re-land r262863
​https://bugs.webkit.org/show_bug.cgi?id=213654

Reviewed by Tadeu Zagallo.

r263575 should fix the crash we saw.

• wtf/cocoa/MainThreadCocoa.mm:

(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):
(-[JSWTFMainThreadCaller call]): Deleted.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/RunLoop.cpp (modified) (1 diff)
• wtf/RunLoop.h (modified) (1 diff)
• wtf/cocoa/MainThreadCocoa.mm (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-06-26  Geoffrey Garen  <ggaren@apple.com>
+
+        Re-land r262863
+        https://bugs.webkit.org/show_bug.cgi?id=213654
+
+        Reviewed by Tadeu Zagallo.
+
+        r263575 should fix the crash we saw.
+
+        * wtf/cocoa/MainThreadCocoa.mm:
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        (-[JSWTFMainThreadCaller call]): Deleted.
+
 2020-06-26  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/wtf/RunLoop.cpp

@@ -69 +69 @@
     ASSERT(s_mainRunLoop);
     return *s_mainRunLoop;
-}
-
-RunLoop* RunLoop::mainIfExists()
-{
-    return s_mainRunLoop;
 }
 

trunk/Source/WTF/wtf/RunLoop.h

@@ -67 +67 @@
     WTF_EXPORT_PRIVATE static RunLoop& current();
     WTF_EXPORT_PRIVATE static RunLoop& main();
-    WTF_EXPORT_PRIVATE static RunLoop* mainIfExists();
 #if USE(WEB_THREAD)
     WTF_EXPORT_PRIVATE static RunLoop& web();

trunk/Source/WTF/wtf/cocoa/MainThreadCocoa.mm

@@ -45 +45 @@
 #endif
 
-@interface JSWTFMainThreadCaller : NSObject
-- (void)call;
-@end
-
-@implementation JSWTFMainThreadCaller
-
-- (void)call
-{
-    WTF::dispatchFunctionsFromMainThread();
-}
-
-@end
-
 #define LOG_CHANNEL_PREFIX Log
 
@@ -67 +54 @@
 WTFLogChannel LogThreading = { WTFLogChannelState::On, "Threading", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
 #endif
-
-static JSWTFMainThreadCaller* staticMainThreadCaller;
 
 #if USE(WEB_THREAD)
@@ -83 +68 @@
         RELEASE_LOG_FAULT(Threading, "WebKit Threading Violation - initial use of WebKit from a secondary thread.");
     ASSERT(pthread_main_np());
-
-    ASSERT(!staticMainThreadCaller);
-    staticMainThreadCaller = [[JSWTFMainThreadCaller alloc] init];
 }
 
@@ -97 +79 @@
 #endif
 
-    if (RunLoop::mainIfExists()) {
-        RunLoop::main().dispatch(dispatchFunctionsFromMainThread);
-        return;
-    }
-
-    [staticMainThreadCaller performSelectorOnMainThread:@selector(call) withObject:nil waitUntilDone:NO];
+    RunLoop::main().dispatch(dispatchFunctionsFromMainThread);
 }