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

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

Issue 2103733004: Set navigationStart correctly for all load types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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
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 9aef6de6289d0a67ca59036a9ed386ce55120b07..1ba827fcb2284170ca85e853055e5da4633cbb95 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -169,7 +169,7 @@ FrameLoader::FrameLoader(LocalFrame* frame)
, m_loadType(FrameLoadTypeStandard)
, m_inStopAllLoaders(false)
, m_checkTimer(this, &FrameLoader::checkTimerFired)
- , m_didAccessInitialDocument(false)
+ , m_hasAccessedInitialDocument(false)
, m_didAccessInitialDocumentTimer(this, &FrameLoader::didAccessInitialDocumentTimerFired)
, m_forcedSandboxFlags(SandboxNone)
, m_dispatchingDidClearWindowObjectInMainWorld(false)
@@ -1059,8 +1059,8 @@ void FrameLoader::stopAllLoaders()
void FrameLoader::didAccessInitialDocument()
{
// We only need to notify the client once, and only for the main frame.
- if (isLoadingMainFrame() && !m_didAccessInitialDocument) {
- m_didAccessInitialDocument = true;
+ if (isLoadingMainFrame() && !m_hasAccessedInitialDocument) {
+ m_hasAccessedInitialDocument = true;
// Notify asynchronously, since this is called within a JavaScript security check.
m_didAccessInitialDocumentTimer.startOneShot(0, BLINK_FROM_HERE);
}

Powered by Google App Engine
This is Rietveld 408576698