Title: [186641] branches/safari-600.8-branch/Source/WebKit2
- Revision
- 186641
- Author
- matthew_han...@apple.com
- Date
- 2015-07-09 15:28:01 -0700 (Thu, 09 Jul 2015)
Log Message
Roll out r186559. rdar://problem/21716363
Modified Paths
Diff
Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186640 => 186641)
--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-09 22:28:01 UTC (rev 186641)
@@ -1,5 +1,36 @@
2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+ Roll out r186559. rdar://problem/21716363
+
+ 2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r186559. rdar://problem/21716363
+
+ 2015-07-08 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r183861. rdar://problem/21716677
+
+ 2015-05-05 Alexey Proskuryakov <a...@apple.com>
+
+ 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-09 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186591. rdar://problem/21716407
2015-07-09 David Kilzer <ddkil...@apple.com>
Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186640 => 186641)
--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-09 22:28:01 UTC (rev 186641)
@@ -98,7 +98,7 @@
m_resourceSandboxExtensions.append(resourceSandboxExtension);
ASSERT(RunLoop::isMain());
-
+
if (reply || parameters.shouldBufferResource)
m_bufferedData = WebCore::SharedBuffer::create();
@@ -161,9 +161,12 @@
// Tell the scheduler about this finished loader soon so it can start more network requests.
NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
+
if (m_handle) {
- m_handle->setClient(nullptr);
- m_handle = nullptr;
+ // 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();
}
}
@@ -212,7 +215,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 (186640 => 186641)
--- branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-07-09 22:28:01 UTC (rev 186641)
@@ -116,8 +116,7 @@
AuthenticationClient* coreClient = challenge.authenticationClient();
if (!coreClient) {
- // 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.
+ // This authentication challenge comes from a download.
Download::receivedCredential(challenge, credential);
return;
}
@@ -133,8 +132,7 @@
ASSERT(!challenge.isNull());
AuthenticationClient* coreClient = challenge.authenticationClient();
if (!coreClient) {
- // 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.
+ // This authentication challenge comes from a download.
Download::receivedRequestToContinueWithoutCredential(challenge);
return;
}
@@ -150,8 +148,7 @@
ASSERT(!challenge.isNull());
AuthenticationClient* coreClient = challenge.authenticationClient();
if (!coreClient) {
- // 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.
+ // This authentication challenge comes from a download.
Download::receivedCancellation(challenge);
return;
}
@@ -167,8 +164,7 @@
ASSERT(!challenge.isNull());
AuthenticationClient* coreClient = challenge.authenticationClient();
if (!coreClient) {
- // 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.
+ // This authentication challenge comes from a download.
Download::receivedRequestToPerformDefaultHandling(challenge);
return;
}
@@ -184,8 +180,7 @@
ASSERT(!challenge.isNull());
AuthenticationClient* coreClient = challenge.authenticationClient();
if (!coreClient) {
- // 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.
+ // This authentication challenge comes from a download.
Download::receivedChallengeRejection(challenge);
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
