third_party/WebKit/Source/core/inspector/InspectorDOMAgent.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/inspector/InspectorDOMAgent.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: 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/input/EventHandler.cpp ('K') | « third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

index 9c2e7cc2bb33e9583d90af38d1c4b45eabae1b7c..5b37c793d6b729832fc21ec1d3424c869cf9f529 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

@@ -1655,7 +1655,7 @@ Node* InspectorDOMAgent::innerParentNode(Node* node)

Document* document = toDocument(node);

if (HTMLImportLoader* loader = document->importLoader())

return loader->firstImport()->link();

- return document->ownerElement();

+ return document->localOwnerElement();

}

return node->parentOrShadowHostNode();

}

@@ -1679,7 +1679,7 @@ void InspectorDOMAgent::domContentLoadedEventFired(LocalFrame* frame)

void InspectorDOMAgent::invalidateFrameOwnerElement(LocalFrame* frame)

{

- HTMLFrameOwnerElement* frameOwner = frame->document()->ownerElement();

+ HTMLFrameOwnerElement* frameOwner = frame->document()->localOwnerElement();

if (!frameOwner)

return;