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

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

Issue 1058763002: Introduce Node::needsDistributionRecalc and use it in ElementShadow to fix the wrong assertions. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Todo in the comment Created 5 years, 8 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 | « Source/core/dom/Node.cpp ('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 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 root = root->olderShadowRoot(); 234 root = root->olderShadowRoot();
235 otherRoot = otherRoot->olderShadowRoot(); 235 otherRoot = otherRoot->olderShadowRoot();
236 } 236 }
237 237
238 return true; 238 return true;
239 } 239 }
240 240
241 const InsertionPoint* ElementShadow::finalDestinationInsertionPointFor(const Nod e* key) const 241 const InsertionPoint* ElementShadow::finalDestinationInsertionPointFor(const Nod e* key) const
242 { 242 {
243 ASSERT(key && !key->document().childNeedsDistributionRecalc()); 243 ASSERT(key && !key->needsDistributionRecalc());
244 NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoint s.find(key); 244 NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoint s.find(key);
245 #if ENABLE(OILPAN) 245 #if ENABLE(OILPAN)
246 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value->last().get (); 246 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value->last().get ();
247 #else 247 #else
248 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.last().get( ); 248 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.last().get( );
249 #endif 249 #endif
250 } 250 }
251 251
252 const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(c onst Node* key) const 252 const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(c onst Node* key) const
253 { 253 {
254 ASSERT(key && !key->document().childNeedsDistributionRecalc()); 254 ASSERT(key && !key->needsDistributionRecalc());
255 NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoint s.find(key); 255 NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoint s.find(key);
256 #if ENABLE(OILPAN) 256 #if ENABLE(OILPAN)
257 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.get(); 257 return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.get();
258 #else 258 #else
259 return it == m_nodeToInsertionPoints.end() ? nullptr : &it->value; 259 return it == m_nodeToInsertionPoints.end() ? nullptr : &it->value;
260 #endif 260 #endif
261 } 261 }
262 262
263 void ElementShadow::distribute() 263 void ElementShadow::distribute()
264 { 264 {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 visitor->trace(m_nodeToInsertionPoints); 377 visitor->trace(m_nodeToInsertionPoints);
378 visitor->trace(m_selectFeatures); 378 visitor->trace(m_selectFeatures);
379 // Shadow roots are linked with previous and next pointers which are traced. 379 // Shadow roots are linked with previous and next pointers which are traced.
380 // It is therefore enough to trace one of the shadow roots here and the 380 // It is therefore enough to trace one of the shadow roots here and the
381 // rest will be traced from there. 381 // rest will be traced from there.
382 visitor->trace(m_shadowRoots.head()); 382 visitor->trace(m_shadowRoots.head());
383 #endif 383 #endif
384 } 384 }
385 385
386 } // namespace 386 } // namespace
OLDNEW
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698