Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
index fca45537727c5b82a6ece7969e39f5108a498d7f..5ceb195b6fb2e412588e2853aeb0ad141afb269d 100644 |
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
@@ -321,7 +321,7 @@ void DocumentLoader::finishedLoading(double finishTime) |
clearMainResourceHandle(); |
} |
-void DocumentLoader::redirectReceived(Resource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse) |
+bool DocumentLoader::redirectReceived(Resource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse) |
{ |
ASSERT_UNUSED(resource, resource == m_mainResource); |
ASSERT(!redirectResponse.isNull()); |
@@ -334,17 +334,19 @@ void DocumentLoader::redirectReceived(Resource* resource, ResourceRequest& reque |
if (!redirectingOrigin->canDisplay(requestURL)) { |
FrameLoader::reportLocalLoadFailed(m_frame, requestURL.getString()); |
m_fetcher->stopFetching(); |
- return; |
+ return false; |
} |
if (!frameLoader()->shouldContinueForNavigationPolicy(m_request, SubstituteData(), this, CheckContentSecurityPolicy, m_navigationType, NavigationPolicyCurrentTab, replacesCurrentHistoryItem(), isClientRedirect())) { |
m_fetcher->stopFetching(); |
- return; |
+ return false; |
} |
ASSERT(timing().fetchStart()); |
appendRedirect(requestURL); |
didRedirect(redirectResponse.url(), requestURL); |
frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad(); |
+ |
+ return true; |
} |
static bool canShowMIMEType(const String& mimeType, LocalFrame* frame) |