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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1173513002: Fix Blink commit type for subframes after initial about:blank load. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix broken layout test 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
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index ab13d530431e1dd3f53ade03028c7b33ef594a4f..62ff47794c63db87f7ed2e0a2f8e5e9c3e9366e2 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -1948,10 +1948,9 @@ void WebLocalFrameImpl::loadJavaScriptURL(const KURL& url)
static void ensureFrameLoaderHasCommitted(FrameLoader& frameLoader)
{
- if (frameLoader.stateMachine()->committedFirstRealDocumentLoad())
+ if (frameLoader.stateMachine()->committedMultipleRealLoads())
return;
- frameLoader.stateMachine()->advanceTo(frameLoader.client()->backForwardLength() > 1 ?
- FrameLoaderStateMachine::CommittedMultipleRealLoads : FrameLoaderStateMachine::CommittedFirstRealLoad);
+ frameLoader.stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedMultipleRealLoads);
Charlie Reis 2015/06/09 07:14:18 After looking at how Blink uses these states, I th
Nate Chapin 2015/06/09 18:25:33 CommittedMultipleRealLoads isn't used for a whole
Charlie Reis 2015/06/11 16:43:48 Oh, I see; it was introduced in https://codereview
}
void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame, const WebString& name, WebSandboxFlags flags)
« Source/core/loader/NavigationScheduler.cpp ('K') | « Source/core/loader/NavigationScheduler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698