Source/core/dom/shadow/ElementShadow.cpp - Issue 137993003: Revert the feature of the <shadow> element as 'a function call' to the previous behavior.

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: Source/core/dom/shadow/ElementShadow.cpp

Issue 137993003: Revert the feature of the <shadow> element as 'a function call' to the previous behavior. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Update LayoutTests/TestExpectations Created 6 years, 11 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 | « LayoutTests/fast/dom/shadow/shadow-insertion-point-rendering-multiple-shadow-roots-expected.html ('k') | Source/core/dom/shadow/InsertionPoint.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/shadow/ElementShadow.cpp

diff --git a/Source/core/dom/shadow/ElementShadow.cpp b/Source/core/dom/shadow/ElementShadow.cpp

index 790c9ab808afdd14fb2d01b1e4dacabd64d718f8..722b3559d1972b8babc63e58b07cdfbc71c67984 100644

--- a/Source/core/dom/shadow/ElementShadow.cpp

+++ b/Source/core/dom/shadow/ElementShadow.cpp

@@ -276,21 +276,15 @@ void ElementShadow::distribute()

if (!point->isActive())

continue;

if (point->hasTagName(HTMLNames::shadowTag)) {

- if (!shadowInsertionPoint)

- shadowInsertionPoint = toHTMLShadowElement(point);

+ ASSERT(!shadowInsertionPoint);

+ shadowInsertionPoint = toHTMLShadowElement(point);

+ shadowInsertionPoints.append(shadowInsertionPoint);

} else {

pool.distributeTo(point, this);

if (ElementShadow* shadow = shadowWhereNodeCanBeDistributed(*point))

shadow->setNeedsDistributionRecalc();

}

- if (shadowInsertionPoint) {

- shadowInsertionPoints.append(shadowInsertionPoint);

- if (shadowInsertionPoint->hasChildNodes())

- pool.populateChildren(*shadowInsertionPoint);

- } else {

- pool.clear();

- }

}

for (size_t i = shadowInsertionPoints.size(); i > 0; --i) {