[webkit-changes] [186869] branches/safari-600.8-branch/Source

Wed, 15 Jul 2015 16:05:18 -0700

Title: [186869] branches/safari-600.8-branch/Source

Diff

Modified: branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in (186868 => 186869)


--- branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in	2015-07-15 23:00:30 UTC (rev 186868)
+++ branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in	2015-07-15 23:04:41 UTC (rev 186869)
@@ -404,6 +404,7 @@
 __ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv
 __ZN7WebCore14ResourceHandle45continueCanAuthenticateAgainstProtectionSpaceEb
 __ZN7WebCore14ResourceHandle6createEPNS_17NetworkingContextERKNS_15ResourceRequestEPNS_20ResourceHandleClientEbb
+__ZN7WebCore14ResourceHandle9setClientEPNS_20ResourceHandleClientE
 __ZN7WebCore14ResourceLoader14cancelledErrorEv
 __ZN7WebCore14ResourceLoader32didCancelAuthenticationChallengeERKNS_23AuthenticationChallengeE
 __ZN7WebCore14ResourceLoader6cancelERKNS_13ResourceErrorE
@@ -2648,7 +2649,6 @@
 __ZN7WebCore14IconController3urlEv
 __ZN7WebCore14RenderThemeIOS22setContentSizeCategoryERKN3WTF6StringE
 __ZN7WebCore14ResourceHandle6cancelEv
-__ZN7WebCore14ResourceHandle9setClientEPNS_20ResourceHandleClientE
 __ZN7WebCore14ResourceHandleD1Ev
 __ZN7WebCore14areRangesEqualEPKNS_5RangeES2_
 __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_

Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186868 => 186869)


--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-15 23:00:30 UTC (rev 186868)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-15 23:04:41 UTC (rev 186869)
@@ -1,5 +1,32 @@
 2015-07-15  Matthew Hanson  <[email protected]>
 
+        Merge r186559. rdar://problem/21716363
+
+    2015-07-08  Matthew Hanson  <[email protected]>
+
+            Merge r183861. rdar://problem/21716677
+
+        2015-05-05  Alexey Proskuryakov  <[email protected]>
+
+                NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
+                https://bugs.webkit.org/show_bug.cgi?id=144641
+                rdar://problem/20250960
+
+                Reviewed by David Kilzer.
+
+                * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):
+                Clear the client pointer.
+
+                * Shared/Authentication/AuthenticationManager.cpp:
+                (WebKit::AuthenticationManager::useCredentialForChallenge):
+                (WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+                (WebKit::AuthenticationManager::cancelChallenge):
+                (WebKit::AuthenticationManager::performDefaultHandling):
+                (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
+                Updated comments, which were not accurate, at least on Mac.
+
+2015-07-15  Matthew Hanson  <[email protected]>
+
         Merge r186781. rdar://problem/21708063
 
     2015-07-13  David Kilzer  <[email protected]>

Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186868 => 186869)


--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-15 23:00:30 UTC (rev 186868)
+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-15 23:04:41 UTC (rev 186869)
@@ -98,7 +98,7 @@
         m_resourceSandboxExtensions.append(resourceSandboxExtension);
 
     ASSERT(RunLoop::isMain());
-    
+
     if (reply || parameters.shouldBufferResource)
         m_bufferedData = WebCore::SharedBuffer::create();
 
@@ -161,12 +161,9 @@
 
     // Tell the scheduler about this finished loader soon so it can start more network requests.
     NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
-
     if (m_handle) {
-        // Explicit deref() balanced by a ref() in NetworkResourceLoader::start()
-        // This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.
-        m_handle = 0;
-        deref();
+        m_handle->setClient(nullptr);
+        m_handle = nullptr;
     }
 }
 
@@ -215,7 +212,7 @@
 
     // FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.
     // Such buffering will need to be thread safe, as this callback is happening on a background thread.
-    
+
     m_bytesReceived += buffer->size();
     if (m_bufferedData)
         m_bufferedData->append(buffer.get());

Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (186868 => 186869)


--- branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-15 23:00:30 UTC (rev 186868)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-15 23:04:41 UTC (rev 186869)
@@ -116,7 +116,8 @@
     
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCredential(challenge, credential);
         return;
     }
@@ -132,7 +133,8 @@
     ASSERT(!challenge.isNull());
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToContinueWithoutCredential(challenge);
         return;
     }
@@ -148,7 +150,8 @@
     ASSERT(!challenge.isNull());
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCancellation(challenge);
         return;
     }
@@ -164,7 +167,8 @@
     ASSERT(!challenge.isNull());
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToPerformDefaultHandling(challenge);
         return;
     }
@@ -180,7 +184,8 @@
     ASSERT(!challenge.isNull());
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedChallengeRejection(challenge);
         return;
     }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to