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

Unified Diff: third_party/WebKit/Source/core/dom/Node.cpp

Issue 1717053002: Don't try to find a slot in a v0 shadow tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/LayoutTests/fast/dom/shadow/slotted-pseudo-element-in-v0-tree-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Node.cpp
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
index 832a32753ea3be8d7e1d126a70b68b588392669c..b408dbafc4390a10fb859485ed7062a023d6868b 100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -2262,8 +2262,10 @@ PassRefPtrWillBeRawPtr<StaticNodeList> Node::getDestinationInsertionPoints()
HTMLSlotElement* Node::assignedSlot() const
{
ASSERT(!needsDistributionRecalc());
- if (ElementShadow* shadow = parentElementShadow())
- return shadow->assignedSlotFor(*this);
+ if (ElementShadow* shadow = parentElementShadow()) {
+ if (shadow->isV1())
+ return shadow->assignedSlotFor(*this);
+ }
return nullptr;
}
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/shadow/slotted-pseudo-element-in-v0-tree-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698