third_party/WebKit/Source/core/dom/Document.cpp - Issue 2266353004: Make Document::styleForElementIgnoringPendingStyleSheets() be aware of a flat tree structure

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/Document.cpp

Issue 2266353004: Make Document::styleForElementIgnoringPendingStyleSheets() be aware of a flat tree structure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update the test Created 4 years, 4 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/LayoutTests/shadow-dom/css-style-inherit.html ('K') | « third_party/WebKit/LayoutTests/shadow-dom/css-style-inherit-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f8d81f74113d91ab2d04a58971a36c4c6f6bf22a..aced0508376b5041f43a6e4feea9be65fbfd17bb 100644

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

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

@@ -1992,7 +1992,11 @@ PassRefPtr<ComputedStyle> Document::styleForElementIgnoringPendingStylesheets(El

{

DCHECK_EQ(element->document(), this);

StyleEngine::IgnoringPendingStylesheet ignoring(styleEngine());

- return ensureStyleResolver().styleForElement(element, element->parentNode() ? element->parentNode()->ensureComputedStyle() : 0);

+ if (!element->canParticipateInFlatTree())

+ return ensureStyleResolver().styleForElement(element, nullptr);

+ ContainerNode* parent = LayoutTreeBuilderTraversal::parent(*element);

+ return ensureStyleResolver().styleForElement(element, parent ? parent->ensureComputedStyle() : nullptr);

}

PassRefPtr<ComputedStyle> Document::styleForPage(int pageIndex)