| Index: Source/core/loader/DocumentLoader.cpp
|
| diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
|
| index a7cefb67954b51ed7de97528dc42e5c037dd7d3f..f0e05a4a196f2da91bb9dcdc043b57990dab9cf2 100644
|
| --- a/Source/core/loader/DocumentLoader.cpp
|
| +++ b/Source/core/loader/DocumentLoader.cpp
|
| @@ -267,7 +267,7 @@ bool DocumentLoader::isRedirectAfterPost(const ResourceRequest& newRequest, cons
|
| return false;
|
| }
|
|
|
| -bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy policy, bool isTransitionNavigation)
|
| +bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy policy)
|
| {
|
| // Don't ask if we are loading an empty URL.
|
| if (request.url().isEmpty() || m_substituteData.isValid())
|
| @@ -285,7 +285,7 @@ bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& re
|
| return false;
|
| }
|
|
|
| - policy = frameLoader()->client()->decidePolicyForNavigation(request, this, policy, isTransitionNavigation);
|
| + policy = frameLoader()->client()->decidePolicyForNavigation(request, this, policy);
|
| if (policy == NavigationPolicyCurrentTab)
|
| return true;
|
| if (policy == NavigationPolicyIgnore)
|
| @@ -750,8 +750,6 @@ PassRefPtrWillBeRawPtr<DocumentWriter> DocumentLoader::createWriterFor(const Doc
|
| if (ownerDocument) {
|
| document->setCookieURL(ownerDocument->cookieURL());
|
| document->setSecurityOrigin(ownerDocument->securityOrigin());
|
| - if (ownerDocument->isTransitionDocument())
|
| - document->setIsTransitionDocument(true);
|
| }
|
|
|
| frame->loader().didBeginDocument(dispatch);
|
|
|