| 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 d0c6f2176eeb22d6831d589ca52935a4299cf71f..06ef809c66abecc81a797923acca2df8b2518ec5 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1118,8 +1118,14 @@ FrameLoadType FrameLoader::loadType() const
|
| void FrameLoader::restoreScrollPositionAndViewState()
|
| {
|
| FrameView* view = m_frame->view();
|
| - if (!m_frame->page() || !view || !view->layoutViewportScrollableArea() || !m_currentItem || !m_stateMachine.committedFirstRealDocumentLoad())
|
| + if (!m_frame->page()
|
| + || !view
|
| + || !view->layoutViewportScrollableArea()
|
| + || !m_currentItem
|
| + || !m_stateMachine.committedFirstRealDocumentLoad()
|
| + || !documentLoader()) {
|
| return;
|
| + }
|
|
|
| if (!needsHistoryItemRestore(m_loadType))
|
| return;
|
|
|