third_party/WebKit/Source/web/WebFrame.cpp - Issue 1381003004: Better distinguish didFinishLoad and didStopLoading

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/WebFrame.cpp

Issue 1381003004: Better distinguish didFinishLoad and didStopLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix android failure Created 5 years, 2 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

« chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java ('K') | « third_party/WebKit/Source/core/loader/FrameLoader.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebFrame.cpp

diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp

index a1f3cd60efa89ff2014de9e3dc694cbe09fd68de..c7bd678dcb96f8ed2e5fd35ca8927bef4d9a4574 100644

--- a/third_party/WebKit/Source/web/WebFrame.cpp

+++ b/third_party/WebKit/Source/web/WebFrame.cpp

@@ -285,6 +285,13 @@ WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& webElement)

return fromFrame(toHTMLFrameElementBase(element)->contentFrame());

}

+bool WebFrame::isLoading() const

+ if (Frame* frame = toCoreFrame(this))

+ return frame->isLoading();

+ return false;

WebFrame* WebFrame::fromFrame(Frame* frame)

{

if (!frame)