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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2611753003: Rename blink::Page's load deferral to suspension (Closed)
Patch Set: Created 3 years, 12 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index fde5f299ac1e539ba4f62f6f845d6b91866f77a7..cadec38f347bc616f6c803954df2aeccdb3d58e4 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -228,10 +228,10 @@ void FrameLoader::init() {
m_frame->document()->cancelParsing();
m_stateMachine.advanceTo(
FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
- // Self-suspend if created in an already deferred Page. Note that both
+ // Self-suspend if created in an already suspended Page. Note that both
// startLoadingMainResource() and cancelParsing() may have already detached
// the frame, since they both fire JS events.
- if (m_frame->page() && m_frame->page()->defersLoading())
+ if (m_frame->page() && m_frame->page()->suspended())
setDefersLoading(true);
takeObjectSnapshot();
}
@@ -749,7 +749,7 @@ void FrameLoader::checkCompleted() {
void FrameLoader::checkTimerFired(TimerBase*) {
if (Page* page = m_frame->page()) {
- if (page->defersLoading())
+ if (page->suspended())
return;
}
checkCompleted();
@@ -1093,8 +1093,7 @@ void FrameLoader::load(const FrameLoadRequest& passedRequest,
if (m_inStopAllLoaders)
return;
- if (m_frame->page()->defersLoading() &&
- isBackForwardLoadType(frameLoadType)) {
+ if (m_frame->page()->suspended() && isBackForwardLoadType(frameLoadType)) {
m_deferredHistoryLoad = DeferredHistoryLoad::create(
passedRequest.resourceRequest(), historyItem, frameLoadType,
historyLoadType);

Powered by Google App Engine
This is Rietveld 408576698