Changeset 224348 in webkit

Timestamp:

Nov 2, 2017 12:12:05 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Fix iOS WebKitLegacy after r224267
​https://bugs.webkit.org/show_bug.cgi?id=179189

Reviewed by Tim Horton.

Use callOnMainThread instead of dispatch_async to work correctly on the web thread.

• platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:

(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveAuthenticationChallenge:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:canAuthenticateAgainstProtectionSpace:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveData:lengthReceived:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connectionDidFinishLoading:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:didFailWithError:]):
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willCacheResponse:]):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-02  Alex Christensen  <achristensen@webkit.org>
+
+        Fix iOS WebKitLegacy after r224267
+        https://bugs.webkit.org/show_bug.cgi?id=179189
+
+        Reviewed by Tim Horton.
+
+        Use callOnMainThread instead of dispatch_async to work correctly on the web thread.
+
+        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveAuthenticationChallenge:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:canAuthenticateAgainstProtectionSpace:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveResponse:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didReceiveData:lengthReceived:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connectionDidFinishLoading:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didFailWithError:]):
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willCacheResponse:]):
+
 2017-11-02  Adrian Perez de Castro  <aperez@igalia.com>
 

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

@@ -130 +130 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 
     dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
@@ -154 +154 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 }
 
@@ -176 +176 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
-    
+        callOnMainThread(WTFMove(work));
+
     dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
     return m_boolResult;
@@ -215 +215 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
-    
+        callOnMainThread(WTFMove(work));
+
     dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
 }
@@ -244 +244 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 }
 
@@ -264 +264 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 }
 
@@ -274 +274 @@
     LOG(Network, "Handle %p delegate connectionDidFinishLoading:%p", m_handle, connection);
 
-    auto task = [self = self, protectedSelf = RetainPtr<id>(self)] () mutable {
+    auto work = [self = self, protectedSelf = RetainPtr<id>(self)] () mutable {
         if (!m_handle || !m_handle->client())
             return;
@@ -286 +286 @@
 
     if (m_messageQueue)
-        m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(task)));
-    else
-        dispatch_async(dispatch_get_main_queue(), task);
+        m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
+    else
+        callOnMainThread(WTFMove(work));
 }
 
@@ -312 +312 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 }
 
@@ -336 +336 @@
         m_messageQueue->append(std::make_unique<Function<void()>>(WTFMove(work)));
     else
-        dispatch_async(dispatch_get_main_queue(), work);
+        callOnMainThread(WTFMove(work));
 
     dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);