Changeset 148120 in webkit
- Timestamp:
- Apr 10, 2013 11:53:49 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r148117 r148120 1 2013-04-10 Zoltan Horvath <zoltan@webkit.org> 2 3 [CSS Exclusions] Increasing padding does not correctly layout child blocks 4 https://bugs.webkit.org/show_bug.cgi?id=112929 5 6 Reviewed by David Hyatt. 7 8 If a child block has changed dimension inside a shape and it has affected the block siblings 9 we need to relayout the content inside the shape. 10 11 * fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout-expected.html: Added. 12 * fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html: Added. 13 1 14 2013-04-10 Alexandru Chiculita <achicu@adobe.com> 2 15 -
trunk/Source/WebCore/ChangeLog
r148119 r148120 1 2013-04-10 Zoltan Horvath <zoltan@webkit.org> 2 3 [CSS Exclusions] Increasing padding does not correctly layout child blocks 4 https://bugs.webkit.org/show_bug.cgi?id=112929 5 6 Reviewed by David Hyatt. 7 8 If a child block has changed dimension inside a shape and it has affected the block siblings 9 we need to relayout the content inside the shape. 10 11 Test: fast/exclusions/shape-inside/shape-inside-sibling-block-dimension-change-needs-relayout.html 12 13 * rendering/RenderBlock.cpp: 14 (WebCore::RenderBlock::updateRegionsAndExclusionsAfterChildLayout): Add condition for dimension change. 15 (WebCore::RenderBlock::layoutBlock): Call updateRegionsAndExclusionsAfterChildLayout with the new parameter. 16 * rendering/RenderBlock.h: 17 (RenderBlock): Add extra parameter to updateRegionsAndExclusionsAfterChildLayout(...) 18 1 19 2013-04-10 Geoffrey Garen <ggaren@apple.com> 2 20 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r148056 r148120 1469 1469 #endif 1470 1470 1471 void RenderBlock::updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread* flowThread )1471 void RenderBlock::updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread* flowThread, bool heightChanged) 1472 1472 { 1473 1473 #if ENABLE(CSS_EXCLUSIONS) … … 1475 1475 if (exclusionShapeInsideInfo && exclusionShapeInsideInfo->needsRemoval()) 1476 1476 setExclusionShapeInsideInfo(nullptr); 1477 1478 // A previous sibling has changed dimension, so we need to relayout the shape with the content 1479 ExclusionShapeInsideInfo* shapeInsideInfo = layoutExclusionShapeInsideInfo(); 1480 if (heightChanged && shapeInsideInfo) 1481 shapeInsideInfo->dirtyShapeSize(); 1477 1482 #endif 1478 1483 computeRegionRangeForBlock(flowThread); … … 1627 1632 } 1628 1633 1629 if (previousHeight != newHeight) 1634 bool heightChanged = (previousHeight != newHeight); 1635 if (heightChanged) 1630 1636 relayoutChildren = true; 1631 1637 1632 1638 layoutPositionedObjects(relayoutChildren || isRoot()); 1633 1639 1634 updateRegionsAndExclusionsAfterChildLayout(flowThread );1640 updateRegionsAndExclusionsAfterChildLayout(flowThread, heightChanged); 1635 1641 1636 1642 // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway). -
trunk/Source/WebCore/rendering/RenderBlock.h
r148056 r148120 581 581 582 582 bool updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread*); 583 void updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread* );583 void updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread*, bool heightChanged = false); 584 584 void computeRegionRangeForBlock(RenderFlowThread*); 585 585
Note: See TracChangeset
for help on using the changeset viewer.