Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: Source/core/loader/DocumentLoader.cpp

Issue 126453005: Simplify starting a same-document navigation (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index c7241eaea48e0db50f56237908cb62464c1286fa..e6d3b2ebbb96011dc4aa5ba6a34a289f16077615 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -302,7 +302,7 @@ bool DocumentLoader::isRedirectAfterPost(const ResourceRequest& newRequest, cons
return false;
}
-bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request, PolicyCheckLoadType policyCheckLoadType)
+bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request)
{
// Don't ask if we are loading an empty URL.
if (request.url().isEmpty() || m_substituteData.isValid())
@@ -314,8 +314,7 @@ bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& re
return false;
NavigationPolicy policy = m_triggeringAction.policy();
- if (policyCheckLoadType != PolicyCheckFragment)
- policy = frameLoader()->client()->decidePolicyForNavigation(request, this, policy);
+ policy = frameLoader()->client()->decidePolicyForNavigation(request, this, policy);
if (policy == NavigationPolicyCurrentTab)
return true;
if (policy == NavigationPolicyIgnore)
@@ -394,7 +393,7 @@ void DocumentLoader::willSendRequest(ResourceRequest& newRequest, const Resource
appendRedirect(newRequest.url());
frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
- if (!shouldContinueForNavigationPolicy(newRequest, PolicyCheckStandard))
+ if (!shouldContinueForNavigationPolicy(newRequest))
cancelMainResourceLoad(ResourceError::cancelledError(m_request.url()));
}
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698