Changeset 224983 in webkit

Timestamp:

Nov 17, 2017, 1:35:30 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Clean up after r224952
​https://bugs.webkit.org/show_bug.cgi?id=179809

Reviewed by Brady Eidson.

• wtf/MainThread.cpp:

(WTF::dispatchFunctionsFromMainThread):
(WTF::callOnMainThread):

• wtf/MainThread.h:
• wtf/generic/MainThreadGeneric.cpp:

(WTF::scheduleDispatchFunctionsOnMainThread):
(WTF::currentRunLoopInCommonMode): Deleted.

• wtf/mac/MainThreadMac.mm:

(WTF::scheduleDispatchFunctionsOnMainThread):
(WTF::currentRunLoopInCommonMode): Deleted.

• wtf/win/MainThreadWin.cpp:

(WTF::scheduleDispatchFunctionsOnMainThread):
(WTF::currentRunLoopInCommonMode): Deleted.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MainThread.cpp (modified) (3 diffs)
• wtf/MainThread.h (modified) (2 diffs)
• wtf/generic/MainThreadGeneric.cpp (modified) (1 diff)
• wtf/mac/MainThreadMac.mm (modified) (2 diffs)
• wtf/win/MainThreadWin.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-11-17  Alex Christensen  <achristensen@webkit.org>
+
+        Clean up after r224952
+        https://bugs.webkit.org/show_bug.cgi?id=179809
+
+        Reviewed by Brady Eidson.
+
+        * wtf/MainThread.cpp:
+        (WTF::dispatchFunctionsFromMainThread):
+        (WTF::callOnMainThread):
+        * wtf/MainThread.h:
+        * wtf/generic/MainThreadGeneric.cpp:
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        (WTF::currentRunLoopInCommonMode): Deleted.
+        * wtf/mac/MainThreadMac.mm:
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        (WTF::currentRunLoopInCommonMode): Deleted.
+        * wtf/win/MainThreadWin.cpp:
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        (WTF::currentRunLoopInCommonMode): Deleted.
+
 2017-11-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/MainThread.cpp

@@ -136 +136 @@
         // This code has effect only in case the scheduleDispatchFunctionsOnMainThread() is implemented in a way that
         // allows input events to be processed before we are back here.
-        if (MonotonicTime::now() - startTime > maxRunLoopSuspensionTime && currentRunLoopInCommonMode()) {
+        if (MonotonicTime::now() - startTime > maxRunLoopSuspensionTime) {
             scheduleDispatchFunctionsOnMainThread();
             break;
@@ -143 +143 @@
 }
 
-void callOnMainThread(Function<void()>&& function, SchedulePairHashSet* pairs)
+void callOnMainThread(Function<void()>&& function)
 {
     ASSERT(function);
@@ -156 +156 @@
 
     if (needToSchedule)
-        scheduleDispatchFunctionsOnMainThread(pairs);
+        scheduleDispatchFunctionsOnMainThread();
 }
 

trunk/Source/WTF/wtf/MainThread.h

@@ -40 +40 @@
 
 class PrintStream;
-class SchedulePair;
-struct SchedulePairHash;
-typedef HashSet<RefPtr<SchedulePair>, SchedulePairHash> SchedulePairHashSet;
 
 // Must be called from the main thread.
 WTF_EXPORT_PRIVATE void initializeMainThread();
 
-WTF_EXPORT_PRIVATE void callOnMainThread(Function<void()>&&, SchedulePairHashSet* = nullptr);
+WTF_EXPORT_PRIVATE void callOnMainThread(Function<void()>&&);
 
 #if PLATFORM(COCOA)
@@ -86 +83 @@
 // NOTE: these functions are internal to the callOnMainThread implementation.
 void initializeMainThreadPlatform();
-void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet* = nullptr);
+void scheduleDispatchFunctionsOnMainThread();
 void dispatchFunctionsFromMainThread();
-bool currentRunLoopInCommonMode();
 
 #if OS(DARWIN) && !USE(GLIB)

trunk/Source/WTF/wtf/generic/MainThreadGeneric.cpp

@@ -68 +68 @@
 }
 
-bool currentRunLoopInCommonMode()
-{
-    return true;
-}
-
-void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet*)
+void scheduleDispatchFunctionsOnMainThread()
 {
     // Use a RunLoop::Timer instead of RunLoop::dispatch() to be able to use a different priority and

trunk/Source/WTF/wtf/mac/MainThreadMac.mm

@@ -123 +123 @@
 }
 
-bool currentRunLoopInCommonMode()
-{
-    NSString *currentMode = [[NSRunLoop currentRunLoop] currentMode];
-    return currentMode == (NSString *)kCFRunLoopCommonModes
-        || currentMode == (NSString *)kCFRunLoopDefaultMode;
-}
-
-void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet* pairs)
+void scheduleDispatchFunctionsOnMainThread()
 {
     ASSERT(staticMainThreadCaller);
@@ -138 +131 @@
         return;
     }
-
-    RetainPtr<NSArray<NSString *>> modes;
-    if (pairs) {
-        modes = adoptNS([[NSMutableArray alloc] initWithCapacity:pairs->size()]);
-        for (auto& pair : *pairs)
-            [(NSMutableArray *)modes.get() addObject:(NSString *)pair->mode()];
-    } else
-        modes = @[(NSString *)kCFRunLoopCommonModes];
     
     if (mainThreadEstablishedAsPthreadMain) {
         ASSERT(!mainThreadNSThread);
-        [staticMainThreadCaller performSelectorOnMainThread:@selector(call) withObject:nil waitUntilDone:NO modes:modes.get()];
+        [staticMainThreadCaller performSelectorOnMainThread:@selector(call) withObject:nil waitUntilDone:NO];
         return;
     }
 
     ASSERT(mainThreadNSThread);
-    [staticMainThreadCaller performSelector:@selector(call) onThread:mainThreadNSThread withObject:nil waitUntilDone:NO modes:modes.get()];
+    [staticMainThreadCaller performSelector:@selector(call) onThread:mainThreadNSThread withObject:nil waitUntilDone:NO];
 }
 

trunk/Source/WTF/wtf/win/MainThreadWin.cpp

@@ -50 +50 @@
 }
 
-bool currentRunLoopInCommonMode()
-{
-    return true;
-}
-
 void initializeMainThreadPlatform()
 {
@@ -73 +68 @@
 }
 
-void scheduleDispatchFunctionsOnMainThread(SchedulePairHashSet*)
+void scheduleDispatchFunctionsOnMainThread()
 {
     ASSERT(threadingWindowHandle);