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

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

Issue 1491123002: Speculative fix for null m_documentLoader in restoreScrollPositionAndViewState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..444196e00ed022f10692d3adc6e613bfc7647bc0 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1124,6 +1124,9 @@ void FrameLoader::restoreScrollPositionAndViewState()
if (!needsHistoryItemRestore(m_loadType))
return;
+ if (!documentLoader())
Nate Chapin 2015/12/03 17:49:13 Maybe add this to the first if() statement? It's s
skobes 2015/12/03 18:40:32 Done.
+ return;
+
bool shouldRestoreScroll = m_currentItem->scrollRestorationType() != ScrollRestorationManual;
bool shouldRestoreScale = m_currentItem->pageScaleFactor();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698