| Index: third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| index da2d2850e6529fb4c2a3391fc4bf7c256ea37fb0..b33d21493967ed0059abfd29dba13408abff5137 100644
|
| --- a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| @@ -119,7 +119,7 @@ protected:
|
| OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest request(originDocument(), m_url, "_self", m_shouldCheckMainWorldContentSecurityPolicy);
|
| request.setReplacesCurrentItem(replacesCurrentItem());
|
| - request.setClientRedirect(ClientRedirect);
|
| + request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| frame->loader().load(request);
|
| }
|
|
|
| @@ -146,7 +146,7 @@ public:
|
| request.setReplacesCurrentItem(replacesCurrentItem());
|
| if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.resourceRequest().url()))
|
| request.resourceRequest().setCachePolicy(ValidatingCacheData);
|
| - request.setClientRedirect(ClientRedirect);
|
| + request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| frame->loader().load(request);
|
| }
|
|
|
| @@ -180,12 +180,11 @@ public:
|
| void fire(LocalFrame* frame) override
|
| {
|
| OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| - ResourceRequest resourceRequest =
|
| - frame->loader().resourceRequestForReload(FrameLoadTypeReload, KURL(), ClientRedirect);
|
| + ResourceRequest resourceRequest = frame->loader().resourceRequestForReload(FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirect);
|
| if (resourceRequest.isNull())
|
| return;
|
| FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest);
|
| - request.setClientRedirect(ClientRedirect);
|
| + request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| frame->loader().load(request, FrameLoadTypeReload);
|
| }
|
|
|
| @@ -209,7 +208,7 @@ public:
|
| SubstituteData substituteData(SharedBuffer::create(), "text/plain", "UTF-8", KURL(), ForceSynchronousLoad);
|
| FrameLoadRequest request(originDocument(), url(), substituteData);
|
| request.setReplacesCurrentItem(true);
|
| - request.setClientRedirect(ClientRedirect);
|
| + request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| frame->loader().load(request);
|
| }
|
| private:
|
| @@ -334,7 +333,7 @@ void NavigationScheduler::scheduleLocationChange(Document* originDocument, const
|
| FrameLoadRequest request(originDocument, m_frame->document()->completeURL(url), "_self");
|
| request.setReplacesCurrentItem(replacesCurrentItem);
|
| if (replacesCurrentItem)
|
| - request.setClientRedirect(ClientRedirect);
|
| + request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| m_frame->loader().load(request);
|
| return;
|
| }
|
|
|