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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 if (!insertionPoint->containingShadowRoot()->isOpenOrV0()) 2255 if (!insertionPoint->containingShadowRoot()->isOpenOrV0())
2256 break; 2256 break;
2257 filteredInsertionPoints.append(insertionPoint); 2257 filteredInsertionPoints.append(insertionPoint);
2258 } 2258 }
2259 return StaticNodeList::adopt(filteredInsertionPoints); 2259 return StaticNodeList::adopt(filteredInsertionPoints);
2260 } 2260 }
2261 2261
2262 HTMLSlotElement* Node::assignedSlot() const 2262 HTMLSlotElement* Node::assignedSlot() const
2263 { 2263 {
2264 ASSERT(!needsDistributionRecalc()); 2264 ASSERT(!needsDistributionRecalc());
2265 if (ElementShadow* shadow = parentElementShadow()) 2265 if (ElementShadow* shadow = parentElementShadow()) {
2266 return shadow->assignedSlotFor(*this); 2266 if (shadow->isV1())
2267 return shadow->assignedSlotFor(*this);
2268 }
2267 return nullptr; 2269 return nullptr;
2268 } 2270 }
2269 2271
2270 HTMLSlotElement* Node::assignedSlotForBinding() 2272 HTMLSlotElement* Node::assignedSlotForBinding()
2271 { 2273 {
2272 updateDistribution(); 2274 updateDistribution();
2273 if (ElementShadow* shadow = parentElementShadow()) { 2275 if (ElementShadow* shadow = parentElementShadow()) {
2274 if (shadow->isV1() && shadow->isOpenOrV0()) 2276 if (shadow->isV1() && shadow->isOpenOrV0())
2275 return shadow->assignedSlotFor(*this); 2277 return shadow->assignedSlotFor(*this);
2276 } 2278 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
2425 2427
2426 void showNodePath(const blink::Node* node) 2428 void showNodePath(const blink::Node* node)
2427 { 2429 {
2428 if (node) 2430 if (node)
2429 node->showNodePathForThis(); 2431 node->showNodePathForThis();
2430 else 2432 else
2431 fprintf(stderr, "Cannot showNodePath for (nil)\n"); 2433 fprintf(stderr, "Cannot showNodePath for (nil)\n");
2432 } 2434 }
2433 2435
2434 #endif 2436 #endif
OLDNEW
« 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