Changeset 225003 in webkit

Timestamp:

Nov 17, 2017 5:00:48 PM (6 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION(224348): [mac-wk1] LayoutTest media/video-src-remove.html is a flaky timeout
​https://bugs.webkit.org/show_bug.cgi?id=179806

Reviewed by Jer Noble.

In r224348 I used callOnMainThread to fix UIWebView which uses the web thread, but Mac doesn't
use the web thread. Something about the timing of operations in the media stack requires that
dispatch_async be used instead of performSelectorOnMainThread.

• platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:

(-[WebCoreResourceHandleAsOperationQueueDelegate callFunctionOnMainThread:]):
Use callOnMainThread on iOS, dispatch_async on Mac.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-17  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(224348): [mac-wk1] LayoutTest media/video-src-remove.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=179806
+
+        Reviewed by Jer Noble.
+
+        In r224348 I used callOnMainThread to fix UIWebView which uses the web thread, but Mac doesn't
+        use the web thread. Something about the timing of operations in the media stack requires that
+        dispatch_async be used instead of performSelectorOnMainThread.
+        
+        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+        (-[WebCoreResourceHandleAsOperationQueueDelegate callFunctionOnMainThread:]):
+        Use callOnMainThread on iOS, dispatch_async on Mac.
+
 2017-11-17  Per Arne Vollan  <pvollan@apple.com>
 

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

@@ -65 +65 @@
     // This is the common case.
     SchedulePairHashSet* pairs = m_handle && m_handle->context() ? m_handle->context()->scheduledRunLoopPairs() : nullptr;
-    if (!scheduledWithCustomRunLoopMode(pairs))
+    if (!scheduledWithCustomRunLoopMode(pairs)) {
+#if PLATFORM(MAC)
+        return dispatch_async(dispatch_get_main_queue(), BlockPtr<void()>::fromCallable(WTFMove(function)).get());
+#else
         return callOnMainThread(WTFMove(function));
-    
+#endif
+    }
+
     // If we have been scheduled in a custom run loop mode, schedule a block in that mode.
     auto block = BlockPtr<void()>::fromCallable([alreadyCalled = false, function = WTFMove(function)] () mutable {