third_party/WebKit/Source/core/dom/StyleEngine.cpp - Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected()

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

Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed Created 4 years, 5 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/dom/StyleElement.cpp ('k') | third_party/WebKit/Source/core/dom/TreeScopeStyleSheetCollection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f6628b6448252e74358d5de8bdf1a83e0f12c688..1e36ebbccb8fbe5b045ca04e1592ab466fbd15de 100644

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

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

@@ -147,7 +147,7 @@ void StyleEngine::removePendingSheet(Node* styleSheetCandidateNode, const StyleE

{

DCHECK(styleSheetCandidateNode);

TreeScope* treeScope = isStyleElement(*styleSheetCandidateNode) ? &styleSheetCandidateNode->treeScope() : m_document.get();

- if (styleSheetCandidateNode->inShadowIncludingDocument())

+ if (styleSheetCandidateNode->isConnected())

markTreeScopeDirty(*treeScope);

if (context.addedPendingSheetBeforeBody()) {

@@ -176,7 +176,7 @@ void StyleEngine::setNeedsActiveStyleUpdate(StyleSheet* sheet, StyleResolverUpda

if (sheet && document().isActive()) {

Node* node = sheet->ownerNode();

- if (node && node->inShadowIncludingDocument()) {

+ if (node && node->isConnected()) {

TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;

DCHECK(isStyleElement(*node) || node->treeScope() == m_document);

markTreeScopeDirty(treeScope);

@@ -188,7 +188,7 @@ void StyleEngine::setNeedsActiveStyleUpdate(StyleSheet* sheet, StyleResolverUpda

void StyleEngine::addStyleSheetCandidateNode(Node* node)

{

- if (!node->inShadowIncludingDocument() || document().isDetached())

+ if (!node->isConnected() || document().isDetached())

return;

TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;

@@ -225,7 +225,7 @@ void StyleEngine::removeStyleSheetCandidateNode(Node* node, TreeScope& treeScope

void StyleEngine::modifiedStyleSheetCandidateNode(Node* node)

{

- if (!node->inShadowIncludingDocument())

+ if (!node->isConnected())

return;

TreeScope& treeScope = isStyleElement(*node) ? node->treeScope() : *m_document;