third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp - Issue 1668603003: Devtools: Switch JS execution context to match inspected node

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 1668603003: Devtools: Switch JS execution context to match inspected node (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 | « third_party/WebKit/LayoutTests/inspector/elements/selected-element-changes-execution-context-expected.txt ('k') | third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js » ('j') | third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js » ('J')
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 6daf03ca9882992ef9ab8dc2195382b207123818..bb2c45304ae6c2f7a5f55399a7df9f7355cf9c6d 100644

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

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

@@ -1522,6 +1522,12 @@ PassRefPtr<protocol::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNo

value->setContentDocument(buildObjectForNode(doc, 0, nodesMap));

}

+ if (node->parentNode() && node->parentNode()->isDocumentNode() && !node->parentNode()->parentNode()) {

pfeldman 2016/02/17 01:18:46 the last check should not be necessary.

samli 2016/02/18 02:14:36 Done.

+ LocalFrame* frame = node->document().frame();

+ if (frame)

+ value->setFrameId(IdentifiersFactory::frameId(frame));

+ }

ElementShadow* shadow = element->shadow();

if (shadow) {

RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>> shadowRoots = protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>::create();