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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2710983003: Move HistoryItem handling to DocumentLoader (Closed)
Patch Set: Experiment to fix DCHECKing tests Created 3 years, 9 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
« third_party/WebKit/Source/core/frame/History.cpp ('K') | « third_party/WebKit/Source/core/frame/History.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp » ('j') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 429c13655b0cf65c691e469753ecbc0f954cd5cb..2da3c007439cb79cf7eb97685788ea258111d055 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -63,6 +63,7 @@
#include "core/layout/api/LayoutPartItem.h"
#include "core/layout/api/LayoutViewItem.h"
#include "core/layout/compositing/PaintLayerCompositor.h"
+#include "core/loader/DocumentLoader.h"
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/NavigationScheduler.h"
#include "core/page/ChromeClient.h"
@@ -377,7 +378,7 @@ void LocalFrame::reload(FrameLoadType loadType,
ClientRedirectPolicy clientRedirectPolicy) {
DCHECK(isReloadLoadType(loadType));
if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) {
- if (!m_loader.currentItem())
+ if (!m_loader.documentLoader()->historyItem())
return;
FrameLoadRequest request =
FrameLoadRequest(nullptr, m_loader.resourceRequestForReload(
« third_party/WebKit/Source/core/frame/History.cpp ('K') | « third_party/WebKit/Source/core/frame/History.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp » ('j') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698