| 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 9a3d254b0e0f0c4bc17c64ee93b386ccda45efd6..59426dd8146ebbc2ff770d250539ebfa8f54c7a1 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();
|
| }
|
| @@ -755,7 +755,7 @@ void FrameLoader::checkCompleted() {
|
|
|
| void FrameLoader::checkTimerFired(TimerBase*) {
|
| if (Page* page = m_frame->page()) {
|
| - if (page->defersLoading())
|
| + if (page->suspended())
|
| return;
|
| }
|
| checkCompleted();
|
| @@ -1099,8 +1099,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);
|
|
|