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

Side by Side Diff: Source/core/dom/shadow/InsertionPoint.cpp

Issue 133213008: Either content elements or shadow elements should not be treated as insertion points if they are no… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/dom/shadow/get-distributed-nodes-orphan-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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 return false; 136 return false;
137 for (Node* node = parentNode(); node; node = node->parentNode()) { 137 for (Node* node = parentNode(); node; node = node->parentNode()) {
138 if (node->isInsertionPoint()) 138 if (node->isInsertionPoint())
139 return false; 139 return false;
140 } 140 }
141 return true; 141 return true;
142 } 142 }
143 143
144 bool InsertionPoint::isActive() const 144 bool InsertionPoint::isActive() const
145 { 145 {
146 if (!inDocument())
147 return false;
146 if (!canBeActive()) 148 if (!canBeActive())
147 return false; 149 return false;
148 ShadowRoot* shadowRoot = containingShadowRoot(); 150 ShadowRoot* shadowRoot = containingShadowRoot();
149 if (!shadowRoot) 151 ASSERT(shadowRoot);
150 return false;
151 if (!hasTagName(shadowTag) || shadowRoot->descendantShadowElementCount() <= 1) 152 if (!hasTagName(shadowTag) || shadowRoot->descendantShadowElementCount() <= 1)
152 return true; 153 return true;
153 154
154 // Slow path only when there are more than one shadow elements in a shadow t ree. That should be a rare case. 155 // Slow path only when there are more than one shadow elements in a shadow t ree. That should be a rare case.
155 const Vector<RefPtr<InsertionPoint> >& insertionPoints = shadowRoot->descend antInsertionPoints(); 156 const Vector<RefPtr<InsertionPoint> >& insertionPoints = shadowRoot->descend antInsertionPoints();
156 for (size_t i = 0; i < insertionPoints.size(); ++i) { 157 for (size_t i = 0; i < insertionPoints.size(); ++i) {
157 InsertionPoint* point = insertionPoints[i].get(); 158 InsertionPoint* point = insertionPoints[i].get();
158 if (point->hasTagName(shadowTag)) 159 if (point->hasTagName(shadowTag))
159 return point == this; 160 return point == this;
160 } 161 }
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 if (!insertionPoints) 302 if (!insertionPoints)
302 return; 303 return;
303 for (size_t i = 0; i < insertionPoints->size(); ++i) 304 for (size_t i = 0; i < insertionPoints->size(); ++i)
304 results.append(insertionPoints->at(i).get()); 305 results.append(insertionPoints->at(i).get());
305 ASSERT(current != insertionPoints->last().get()); 306 ASSERT(current != insertionPoints->last().get());
306 current = insertionPoints->last().get(); 307 current = insertionPoints->last().get();
307 } 308 }
308 } 309 }
309 310
310 } // namespace WebCore 311 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/shadow/get-distributed-nodes-orphan-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698