Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: third_party/WebKit/Source/core/dom/NodeComputedStyle.h

Issue 1489433002: Support the essential part of Shadow DOM v1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert Internals.* Created 5 years 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
Index: third_party/WebKit/Source/core/dom/NodeComputedStyle.h
diff --git a/third_party/WebKit/Source/core/dom/NodeComputedStyle.h b/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
index 1c7f1d70f53c78281667be0cc204c8d9b086d409..b4bca984fe5fca9dd1553c8fbd72c2cf729e6ddc 100644
--- a/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
+++ b/third_party/WebKit/Source/core/dom/NodeComputedStyle.h
@@ -53,7 +53,7 @@ inline ComputedStyle* Node::mutableComputedStyle() const
inline const ComputedStyle* Node::parentComputedStyle() const
{
- if (isActiveInsertionPoint(*this))
+ if (isSlotOrActiveInsertionPoint())
return 0;
ContainerNode* parent = LayoutTreeBuilderTraversal::parent(*this);
return parent ? parent->computedStyle() : 0;
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.cpp ('k') | third_party/WebKit/Source/core/dom/NonDocumentTypeChildNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698