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

Side by Side Diff: Source/core/loader/NavigationScheduler.cpp

Issue 561813003: Prepare blink to unify definitions of load completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add document.close() to scroll-left-while-loading.html Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/web/tests/ActivityLoggerTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2009 Adam Barth. All rights reserved. 5 * Copyright (C) 2009 Adam Barth. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re sourceRequest().url())) 143 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re sourceRequest().url()))
144 request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData); 144 request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData);
145 request.setClientRedirect(ClientRedirect); 145 request.setClientRedirect(ClientRedirect);
146 frame->loader().load(request); 146 frame->loader().load(request);
147 } 147 }
148 }; 148 };
149 149
150 class ScheduledLocationChange final : public ScheduledURLNavigation { 150 class ScheduledLocationChange final : public ScheduledURLNavigation {
151 public: 151 public:
152 ScheduledLocationChange(Document* originDocument, const String& url, bool lo ckBackForwardList) 152 ScheduledLocationChange(Document* originDocument, const String& url, bool lo ckBackForwardList)
153 : ScheduledURLNavigation(0.0, originDocument, url, lockBackForwardList, true) { } 153 : ScheduledURLNavigation(0.0, originDocument, url, lockBackForwardList, !protocolIsJavaScript(url)) { }
154 }; 154 };
155 155
156 class ScheduledReload final : public ScheduledNavigation { 156 class ScheduledReload final : public ScheduledNavigation {
157 public: 157 public:
158 ScheduledReload() 158 ScheduledReload()
159 : ScheduledNavigation(0.0, true, true) 159 : ScheduledNavigation(0.0, true, true)
160 { 160 {
161 } 161 }
162 162
163 virtual void fire(LocalFrame* frame) override 163 virtual void fire(LocalFrame* frame) override
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 m_timer.stop(); 418 m_timer.stop();
419 m_redirect.clear(); 419 m_redirect.clear();
420 } 420 }
421 421
422 void NavigationScheduler::trace(Visitor* visitor) 422 void NavigationScheduler::trace(Visitor* visitor)
423 { 423 {
424 visitor->trace(m_frame); 424 visitor->trace(m_frame);
425 } 425 }
426 426
427 } // namespace blink 427 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/web/tests/ActivityLoggerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698