third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp - Issue 1413583002: Make ElementShadow::youngestShadowRoot() return a reference

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 1413583002: Make ElementShadow::youngestShadowRoot() return a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: one more tail -> head 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.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 57f010ddcdf51a17bb1965aa02feb7b1919e9196..73e439a2df6f101b04abce0a956a5792d9cea363 100644

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

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

@@ -913,11 +913,10 @@ static Node* nextNodeWithShadowDOMInMind(const Node& current, const Node* stayWi

const Element& element = toElement(current);

ElementShadow* elementShadow = element.shadow();

if (elementShadow) {

- ShadowRoot* shadowRoot = elementShadow->youngestShadowRoot();

- if (shadowRoot) {

- if (shadowRoot->type() != ShadowRootType::UserAgent || includeUserAgentShadowDOM)

- return shadowRoot;

- }

+ ShadowRoot& shadowRoot = elementShadow->youngestShadowRoot();

+ if (shadowRoot.type() != ShadowRootType::UserAgent || includeUserAgentShadowDOM)

+ return &shadowRoot;

}

if (current.hasChildren())

@@ -1538,7 +1537,7 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n

ElementShadow* shadow = element->shadow();

if (shadow) {

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

- for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())

+ for (ShadowRoot* root = &shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())

shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));

value->setShadowRoots(shadowRoots);

forcePushChildren = true;