| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index 4b3db84303fd77417009ede4fe373fbce15d4802..92e386aa7c3c50281f65539cf2a9217fc95a32a8 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -1041,7 +1041,10 @@ void FrameLoader::checkLoadCompleteForThisFrame()
|
|
|
| void FrameLoader::didFirstLayout()
|
| {
|
| - if (m_frame->page() && isBackForwardLoadType(m_loadType))
|
| + if (!m_frame->page())
|
| + return;
|
| +
|
| + if (isBackForwardLoadType(m_loadType) || m_loadType == FrameLoadTypeReload || m_loadType == FrameLoadTypeReloadFromOrigin)
|
| history()->restoreScrollPositionAndViewState();
|
| }
|
|
|
|
|