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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1177313002: Revert of Fix Blink commit type for subframes after initial about:blank load. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/loader/NavigationScheduler.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index b331d646191b25c87551737f749177fef9c86d54..ab13d530431e1dd3f53ade03028c7b33ef594a4f 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -1948,12 +1948,10 @@
static void ensureFrameLoaderHasCommitted(FrameLoader& frameLoader)
{
- // Internally, Blink uses CommittedMultipleRealLoads to track whether the
- // next commit should create a new history item or not. Ensure we have
- // reached that state.
- if (frameLoader.stateMachine()->committedMultipleRealLoads())
+ if (frameLoader.stateMachine()->committedFirstRealDocumentLoad())
return;
- frameLoader.stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedMultipleRealLoads);
+ frameLoader.stateMachine()->advanceTo(frameLoader.client()->backForwardLength() > 1 ?
+ FrameLoaderStateMachine::CommittedMultipleRealLoads : FrameLoaderStateMachine::CommittedFirstRealLoad);
}
void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame, const WebString& name, WebSandboxFlags flags)
« no previous file with comments | « Source/core/loader/NavigationScheduler.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698