third_party/WebKit/Source/core/dom/DocumentInit.cpp - Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks.

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/core/dom/DocumentInit.cpp

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove duplication in const overload Created 4 years, 8 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/dom/Document.cpp ('K') | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/DocumentInit.cpp

diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

index df71028100069e2471b3b152f2cad66d4a932f10..b255623b6ba9771b9e48362276a3cb81829f0e7e 100644

--- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp

+++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

@@ -43,10 +43,10 @@ static Document* parentDocument(LocalFrame* frame)

{

if (!frame)

return 0;

- Element* ownerElement = frame->deprecatedLocalOwner();

- if (!ownerElement)

+ Element* localOwnerElement = frame->deprecatedLocalOwner();

+ if (!localOwnerElement)

return 0;

- return &ownerElement->document();

+ return &localOwnerElement->document();

}

DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, Document* contextDocument, HTMLImportsController* importsController)