Changeset 264993 in webkit

Timestamp:

Jul 28, 2020 10:03:00 AM (4 years ago)

Author:

Karl Rackler

Message:

Unreviewed, reverting r264955.

Reverting because this commit may have caused issues with
tests.

Reverted changeset:

"WebCoreResourceHandleAsOperationQueueDelegate can use
RunLoop::dispatch"
​https://bugs.webkit.org/show_bug.cgi?id=214771
​https://trac.webkit.org/changeset/264955

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/cf/RunLoopCF.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-07-28  Karl Rackler  <rackler@apple.com>
+
+        Unreviewed, reverting r264955.
+
+        Reverting because this commit may have caused issues with
+        tests.
+
+        Reverted changeset:
+
+        "WebCoreResourceHandleAsOperationQueueDelegate can use
+        RunLoop::dispatch"
+        https://bugs.webkit.org/show_bug.cgi?id=214771
+        https://trac.webkit.org/changeset/264955
+
 2020-07-27  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/wtf/cf/RunLoopCF.cpp

@@ -87 +87 @@
 void RunLoop::dispatch(const SchedulePairHashSet& schedulePairs, Function<void()>&& function)
 {
-    if (schedulePairs.size() == 1) {
-        auto& schedulePair = *schedulePairs.begin();
-        if (schedulePair->mode() == kCFRunLoopCommonModes && schedulePair->runLoop() == RunLoop::main().m_runLoop)
-            return RunLoop::main().dispatch(WTFMove(function));
-    }
-
     auto timer = createTimer(0_s, false, [] (CFRunLoopTimerRef timer, void* context) {
         AutodrainedPool pool;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-28  Karl Rackler  <rackler@apple.com>
+
+        Unreviewed, reverting r264955.
+
+        Reverting because this commit may have caused issues with
+        tests.
+
+        Reverted changeset:
+
+        "WebCoreResourceHandleAsOperationQueueDelegate can use
+        RunLoop::dispatch"
+        https://bugs.webkit.org/show_bug.cgi?id=214771
+        https://trac.webkit.org/changeset/264955
+
 2020-07-28  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm

@@ -41 +41 @@
 #import <wtf/BlockPtr.h>
 #import <wtf/MainThread.h>
-#import <wtf/RunLoop.h>
 
 using namespace WebCore;
+
+static bool scheduledWithCustomRunLoopMode(const Optional<SchedulePairHashSet>& pairs)
+{
+    if (!pairs)
+        return false;
+    for (auto& pair : *pairs) {
+        auto mode = pair->mode();
+        if (mode != kCFRunLoopCommonModes && mode != kCFRunLoopDefaultMode)
+            return true;
+    }
+    return false;
+}
 
 @implementation WebCoreResourceHandleAsOperationQueueDelegate
@@ -53 +64 @@
         return m_messageQueue->append(makeUnique<Function<void()>>(WTFMove(function)));
 
-    if (!m_scheduledPairs)
+    // This is the common case.
+    if (!scheduledWithCustomRunLoopMode(m_scheduledPairs))
         return callOnMainThread(WTFMove(function));
 
-    RunLoop::dispatch(*m_scheduledPairs, WTFMove(function));
+    // If we have been scheduled in a custom run loop mode, schedule a block in that mode.
+    auto block = makeBlockPtr([alreadyCalled = false, function = WTFMove(function)] () mutable {
+        if (alreadyCalled)
+            return;
+        alreadyCalled = true;
+        function();
+        function = nullptr;
+    });
+    for (auto& pair : *m_scheduledPairs)
+        CFRunLoopPerformBlock(pair->runLoop(), pair->mode(), block.get());
 }