Title: [200917] trunk/Source/WebCore
Revision
200917
Author
[email protected]
Date
2016-05-13 23:31:51 -0700 (Fri, 13 May 2016)

Log Message

Unreviewed attempt to fix the iOS build after the protector variables renaming.

* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200916 => 200917)


--- trunk/Source/WebCore/ChangeLog	2016-05-14 05:51:38 UTC (rev 200916)
+++ trunk/Source/WebCore/ChangeLog	2016-05-14 06:31:51 UTC (rev 200917)
@@ -1,3 +1,19 @@
+2016-05-13  Chris Dumez  <[email protected]>
+
+        Unreviewed attempt to fix the iOS build after the protector variables renaming.
+
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
+        (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
+
 2016-05-13  Zalan Bujtas  <[email protected]>
 
         All scrolling height/width values should be integral rounded.

Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (200916 => 200917)


--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2016-05-14 05:51:38 UTC (rev 200916)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp	2016-05-14 06:31:51 UTC (rev 200917)
@@ -107,7 +107,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle()) {
+        if (!protectedThis->hasHandle()) {
             continueWillSendRequest(nullptr);
             return;
         }
@@ -133,7 +133,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle() || !m_handle->client()) {
+        if (!protectedThis->hasHandle() || !m_handle->client()) {
             continueDidReceiveResponse();
             return;
         }
@@ -174,7 +174,7 @@
     CFRetain(data);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (protector->hasHandle() && m_handle->client()) {
+        if (protectedThis->hasHandle() && m_handle->client()) {
             LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
 
             m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFData(data), originalLength);
@@ -190,7 +190,7 @@
     // capture "this" by pointer value, and use a C++ lambda to prevent other unintentional capturing.
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle() || !m_handle->client())
+        if (!protectedThis->hasHandle() || !m_handle->client())
             return;
 
         LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
@@ -206,7 +206,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
     CFRetain(error);
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (protector->hasHandle() && m_handle->client()) {
+        if (protectedThis->hasHandle() && m_handle->client()) {
             LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
 
             m_handle->client()->didFail(m_handle, ResourceError(error));
@@ -223,7 +223,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle() || !m_handle->client()) {
+        if (!protectedThis->hasHandle() || !m_handle->client()) {
             continueWillCacheResponse(nullptr);
             return;
         }
@@ -243,7 +243,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
     CFRetain(challenge);
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (protector->hasHandle()) {
+        if (protectedThis->hasHandle()) {
             LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
 
             m_handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(challenge, m_handle));
@@ -259,7 +259,7 @@
     // capture "this" by pointer value, and use a C++ lambda to prevent other unintentional capturing.
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle() || !m_handle->client())
+        if (!protectedThis->hasHandle() || !m_handle->client())
             return;
 
         LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
@@ -281,7 +281,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!protector->hasHandle()) {
+        if (!protectedThis->hasHandle()) {
             continueCanAuthenticateAgainstProtectionSpace(false);
             return;
         }
@@ -311,7 +311,7 @@
     RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protectedThis(this);
     CFRetain(dataArray);
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (protector->hasHandle() && m_handle->client()) {
+        if (protectedThis->hasHandle() && m_handle->client()) {
             LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
 
             m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFDataArray(dataArray), -1);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to