| 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 a52bf28c0827f5310a0e239a0d70378389b47b14..29826b3562451d872258d08ebe756bcd12b114af 100644
|
| --- a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| @@ -279,29 +279,21 @@ class ScheduledReload final : public ScheduledNavigation {
|
| ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {}
|
| };
|
|
|
| -class ScheduledPageBlock final : public ScheduledURLNavigation {
|
| +class ScheduledPageBlock final : public ScheduledNavigation {
|
| public:
|
| - static ScheduledPageBlock* create(Document* originDocument,
|
| - const String& url) {
|
| - return new ScheduledPageBlock(originDocument, url);
|
| + static ScheduledPageBlock* create(Document* originDocument, int reason) {
|
| + return new ScheduledPageBlock(originDocument, reason);
|
| }
|
|
|
| void fire(LocalFrame* frame) override {
|
| - std::unique_ptr<UserGestureIndicator> gestureIndicator =
|
| - createUserGestureIndicator();
|
| - SubstituteData substituteData(SharedBuffer::create(), "text/plain", "UTF-8",
|
| - KURL(), ForceSynchronousLoad);
|
| - FrameLoadRequest request(originDocument(), url(), substituteData);
|
| - request.setReplacesCurrentItem(true);
|
| - request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| - maybeLogScheduledNavigationClobber(
|
| - ScheduledNavigationType::ScheduledPageBlock, frame);
|
| - frame->loader().load(request);
|
| + frame->loader().client()->loadErrorPage(reason_);
|
| }
|
|
|
| private:
|
| - ScheduledPageBlock(Document* originDocument, const String& url)
|
| - : ScheduledURLNavigation(0.0, originDocument, url, true, true) {}
|
| + ScheduledPageBlock(Document* originDocument, int reason)
|
| + : ScheduledNavigation(0.0, originDocument, true, true), reason_(reason) {}
|
| +
|
| + int reason_;
|
| };
|
|
|
| class ScheduledFormSubmission final : public ScheduledNavigation {
|
| @@ -462,10 +454,10 @@ void NavigationScheduler::scheduleLocationChange(Document* originDocument,
|
| replacesCurrentItem));
|
| }
|
|
|
| -void NavigationScheduler::schedulePageBlock(Document* originDocument) {
|
| +void NavigationScheduler::schedulePageBlock(Document* originDocument,
|
| + int reason) {
|
| DCHECK(m_frame->page());
|
| - const KURL& url = m_frame->document()->url();
|
| - schedule(ScheduledPageBlock::create(originDocument, url));
|
| + schedule(ScheduledPageBlock::create(originDocument, reason));
|
| }
|
|
|
| void NavigationScheduler::scheduleFormSubmission(Document* document,
|
|
|