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

Side by Side Diff: Source/core/rendering/RenderNamedFlowThread.cpp

Issue 15027005: [CSS Regions] Elements in a region should be assignable to a named flow (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Integrates all feedback. One of the tests causes an ASSERT in ContentShell because of Region Ranges. Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 bool RenderNamedFlowThread::isChildAllowed(RenderObject* child, RenderStyle* sty le) const 406 bool RenderNamedFlowThread::isChildAllowed(RenderObject* child, RenderStyle* sty le) const
407 { 407 {
408 ASSERT(child); 408 ASSERT(child);
409 ASSERT(style); 409 ASSERT(style);
410 410
411 if (!child->node()) 411 if (!child->node())
412 return true; 412 return true;
413 413
414 ASSERT(child->node()->isElementNode()); 414 ASSERT(child->node()->isElementNode());
415 RenderObject* parentRenderer = NodeRenderingContext(child->node()).parentRen derer(); 415 RenderObject* parentRenderer = NodeRenderingContext(child->node()).parentRen derer();
416 if (!parentRenderer)
417 return true;
416 return parentRenderer->isChildAllowed(child, style); 418 return parentRenderer->isChildAllowed(child, style);
417 } 419 }
418 420
419 void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent() 421 void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent()
420 { 422 {
421 RenderFlowThread::dispatchRegionLayoutUpdateEvent(); 423 RenderFlowThread::dispatchRegionLayoutUpdateEvent();
422 InspectorInstrumentation::didUpdateRegionLayout(document(), m_namedFlow.get( )); 424 InspectorInstrumentation::didUpdateRegionLayout(document(), m_namedFlow.get( ));
423 425
424 if (!m_regionLayoutUpdateEventTimer.isActive() && m_namedFlow->hasEventListe ners()) 426 if (!m_regionLayoutUpdateEventTimer.isActive() && m_namedFlow->hasEventListe ners())
425 m_regionLayoutUpdateEventTimer.startOneShot(0); 427 m_regionLayoutUpdateEventTimer.startOneShot(0);
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 lastEndNode = node; 620 lastEndNode = node;
619 } 621 }
620 } 622 }
621 } 623 }
622 if (foundStartPosition || skipOverOutsideNodes) 624 if (foundStartPosition || skipOverOutsideNodes)
623 rangeObjects.append(range); 625 rangeObjects.append(range);
624 } 626 }
625 } 627 }
626 628
627 } 629 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698