Title: [178816] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 178816
- Author
- [email protected]
- Date
- 2015-01-21 00:16:25 -0800 (Wed, 21 Jan 2015)
Log Message
Merged r175718. rdar://problem/19395083
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178815 => 178816)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:15:02 UTC (rev 178815)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:16:25 UTC (rev 178816)
@@ -1,5 +1,26 @@
2015-01-21 Babak Shafiei <[email protected]>
+ Merge r175718.
+
+ 2014-11-06 Yongjun Zhang <[email protected]>
+
+ Don't send identifierForInitialRequest callback method for request with DoNotSendCallbacks option.
+ https://bugs.webkit.org/show_bug.cgi?id=138473
+
+ The iOS specific code that sets up a valid m_identifier is not needed any more, since this
+ will be done later in ResourceLoader::willSendRequest. This also matches the behavior that
+ we don't call assignIdentifierToInitialRequest callback method if the reqeust has
+ DoNotSendCallbacks option.
+
+ Reviewed by Pratik Solanki.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::willSendRequest): Remove iOS specific block for setting up a valid
+ m_identifier. In iOS, also make sure we still bail out if the resource loader was stopped
+ in assignIdentifierToInitialRequest callback by a client.
+
+2015-01-21 Babak Shafiei <[email protected]>
+
Merge r175277.
2014-10-24 Jeffrey Pfau <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/ResourceLoader.cpp (178815 => 178816)
--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/ResourceLoader.cpp 2015-01-21 08:15:02 UTC (rev 178815)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/ResourceLoader.cpp 2015-01-21 08:16:25 UTC (rev 178816)
@@ -254,20 +254,6 @@
ASSERT(!m_reachedTerminalState);
-#if PLATFORM(IOS)
- // Ensure an identifier is always set. This ensures that this assetion is not hit:
- // <rdar://problem/11059794> ASSERTION FAILED: !HashTranslator::equal(KeyTraits::emptyValue(), key) in WebFrameLoaderClient::canAuthenticateAgainstProtectionSpace loading the attached web archive
- // This is not needed in WebKit2, as it doesn't use m_identifier in WebFrameLoaderClient::canAuthenticateAgainstProtectionSpace
- if (!m_identifier) {
- m_identifier = m_frame->page()->progress().createUniqueIdentifier();
- frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifier, documentLoader(), request);
-
- // If this ResourceLoader was stopped as a result of assignIdentifierToInitialRequest, bail out
- if (m_reachedTerminalState)
- return;
- }
-#endif
-
// We need a resource identifier for all requests, even if FrameLoader is never going to see it (such as with CORS preflight requests).
bool createdResourceIdentifier = false;
if (!m_identifier) {
@@ -279,6 +265,12 @@
if (createdResourceIdentifier)
frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifier, documentLoader(), request);
+#if PLATFORM(IOS)
+ // If this ResourceLoader was stopped as a result of assignIdentifierToInitialRequest, bail out
+ if (m_reachedTerminalState)
+ return;
+#endif
+
frameLoader()->notifier().willSendRequest(this, request, redirectResponse);
}
#if ENABLE(INSPECTOR)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
