OLD | NEW |
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 bool RenderNamedFlowThread::isChildAllowed(RenderObject* child, RenderStyle* sty
le) const | 456 bool RenderNamedFlowThread::isChildAllowed(RenderObject* child, RenderStyle* sty
le) const |
457 { | 457 { |
458 ASSERT(child); | 458 ASSERT(child); |
459 ASSERT(style); | 459 ASSERT(style); |
460 | 460 |
461 if (!child->node()) | 461 if (!child->node()) |
462 return true; | 462 return true; |
463 | 463 |
464 ASSERT(child->node()->isElementNode()); | 464 ASSERT(child->node()->isElementNode()); |
465 RenderObject* parentRenderer = NodeRenderingContext(child->node()).parentRen
derer(); | 465 RenderObject* parentRenderer = NodeRenderingContext(child->node()).parentRen
derer(); |
| 466 if (!parentRenderer) |
| 467 return true; |
| 468 |
466 return parentRenderer->isChildAllowed(child, style); | 469 return parentRenderer->isChildAllowed(child, style); |
467 } | 470 } |
468 | 471 |
469 void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent() | 472 void RenderNamedFlowThread::dispatchRegionLayoutUpdateEvent() |
470 { | 473 { |
471 RenderFlowThread::dispatchRegionLayoutUpdateEvent(); | 474 RenderFlowThread::dispatchRegionLayoutUpdateEvent(); |
472 InspectorInstrumentation::didUpdateRegionLayout(document(), m_namedFlow.get(
)); | 475 InspectorInstrumentation::didUpdateRegionLayout(document(), m_namedFlow.get(
)); |
473 | 476 |
474 if (!m_regionLayoutUpdateEventTimer.isActive() && m_namedFlow->hasEventListe
ners()) | 477 if (!m_regionLayoutUpdateEventTimer.isActive() && m_namedFlow->hasEventListe
ners()) |
475 m_regionLayoutUpdateEventTimer.startOneShot(0); | 478 m_regionLayoutUpdateEventTimer.startOneShot(0); |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 lastEndNode = node; | 687 lastEndNode = node; |
685 } | 688 } |
686 } | 689 } |
687 } | 690 } |
688 if (foundStartPosition || skipOverOutsideNodes) | 691 if (foundStartPosition || skipOverOutsideNodes) |
689 rangeObjects.append(range); | 692 rangeObjects.append(range); |
690 } | 693 } |
691 } | 694 } |
692 | 695 |
693 } | 696 } |
OLD | NEW |