Title: [151750] trunk/Source/WebCore
Revision
151750
Author
[email protected]
Date
2013-06-19 13:11:26 -0700 (Wed, 19 Jun 2013)

Log Message

Fix a few missed renames from Exclusions -> Shapes
https://bugs.webkit.org/show_bug.cgi?id=117803

Patch by Bem Jones-Bey <[email protected]> on 2013-06-19
Reviewed by David Hyatt.

In the great CSS Exclusions to CSS Shapes rename, a few instances were
missed. This fixes those instances.

No new tests, no behavior change, just renames.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::updateRegionsAndShapesBeforeChildLayout):
(WebCore::RenderBlock::updateRegionsAndShapesAfterChildLayout):
(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::logicalLeftOffsetForLine):
(WebCore::RenderBlock::logicalRightOffsetForLine):
* rendering/RenderBlock.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock):
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutBlock):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151749 => 151750)


--- trunk/Source/WebCore/ChangeLog	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/ChangeLog	2013-06-19 20:11:26 UTC (rev 151750)
@@ -1,3 +1,29 @@
+2013-06-19  Bem Jones-Bey  <[email protected]>
+
+        Fix a few missed renames from Exclusions -> Shapes
+        https://bugs.webkit.org/show_bug.cgi?id=117803
+
+        Reviewed by David Hyatt.
+
+        In the great CSS Exclusions to CSS Shapes rename, a few instances were
+        missed. This fixes those instances.
+
+        No new tests, no behavior change, just renames.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateRegionsAndShapesBeforeChildLayout):
+        (WebCore::RenderBlock::updateRegionsAndShapesAfterChildLayout):
+        (WebCore::RenderBlock::layoutBlock):
+        (WebCore::RenderBlock::logicalLeftOffsetForLine):
+        (WebCore::RenderBlock::logicalRightOffsetForLine):
+        * rendering/RenderBlock.h:
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::layoutBlock):
+
 2013-06-19  Oliver Hunt  <[email protected]>
 
         Incorrect use of jsCast in a finalizer

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (151749 => 151750)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-06-19 20:11:26 UTC (rev 151750)
@@ -1481,7 +1481,7 @@
 #endif
 }
 
-bool RenderBlock::updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread* flowThread)
+bool RenderBlock::updateRegionsAndShapesBeforeChildLayout(RenderFlowThread* flowThread)
 {
 #if ENABLE(CSS_SHAPES)
     if (!flowThread && !shapeInsideInfo())
@@ -1523,7 +1523,7 @@
 }
 #endif
 
-void RenderBlock::updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread* flowThread, bool heightChanged)
+void RenderBlock::updateRegionsAndShapesAfterChildLayout(RenderFlowThread* flowThread, bool heightChanged)
 {
 #if ENABLE(CSS_SHAPES)
     // A previous sibling has changed dimension, so we need to relayout the shape with the content
@@ -1621,7 +1621,7 @@
     RenderFlowThread* flowThread = flowThreadContainingBlock();
     if (logicalWidthChangedInRegions(flowThread))
         relayoutChildren = true;
-    if (updateRegionsAndExclusionsBeforeChildLayout(flowThread))
+    if (updateRegionsAndShapesBeforeChildLayout(flowThread))
         relayoutChildren = true;
 
     // We use four values, maxTopPos, maxTopNeg, maxBottomPos, and maxBottomNeg, to track
@@ -1691,7 +1691,7 @@
 
     layoutPositionedObjects(relayoutChildren || isRoot());
 
-    updateRegionsAndExclusionsAfterChildLayout(flowThread, heightChanged);
+    updateRegionsAndShapesAfterChildLayout(flowThread, heightChanged);
 
     // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).
     computeOverflow(oldClientAfterEdge);
@@ -4433,7 +4433,7 @@
 
 LayoutUnit RenderBlock::logicalLeftOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining, LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode) const
 {
-#if !ENABLE(CSS_EXCLUSIONS)
+#if !ENABLE(CSS_SHAPES)
     UNUSED_PARAM(offsetMode);
 #endif
     LayoutUnit left = fixedOffset;
@@ -4493,7 +4493,7 @@
 
 LayoutUnit RenderBlock::logicalRightOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining, LayoutUnit logicalHeight, ShapeOutsideFloatOffsetMode offsetMode) const
 {
-#if !ENABLE(CSS_EXCLUSIONS)
+#if !ENABLE(CSS_SHAPES)
     UNUSED_PARAM(offsetMode);
 #endif
     LayoutUnit right = fixedOffset;

Modified: trunk/Source/WebCore/rendering/RenderBlock.h (151749 => 151750)


--- trunk/Source/WebCore/rendering/RenderBlock.h	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/rendering/RenderBlock.h	2013-06-19 20:11:26 UTC (rev 151750)
@@ -576,8 +576,8 @@
     }
 #endif
 
-    bool updateRegionsAndExclusionsBeforeChildLayout(RenderFlowThread*);
-    void updateRegionsAndExclusionsAfterChildLayout(RenderFlowThread*, bool heightChanged = false);
+    bool updateRegionsAndShapesBeforeChildLayout(RenderFlowThread*);
+    void updateRegionsAndShapesAfterChildLayout(RenderFlowThread*, bool heightChanged = false);
     void computeRegionRangeForBlock(RenderFlowThread*);
 
     void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox*);

Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (151749 => 151750)


--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp	2013-06-19 20:11:26 UTC (rev 151750)
@@ -305,7 +305,7 @@
     RenderFlowThread* flowThread = flowThreadContainingBlock();
     if (logicalWidthChangedInRegions(flowThread))
         relayoutChildren = true;
-    if (updateRegionsAndExclusionsBeforeChildLayout(flowThread))
+    if (updateRegionsAndShapesBeforeChildLayout(flowThread))
         relayoutChildren = true;
 
     LayoutSize previousSize = size();
@@ -347,7 +347,7 @@
 
     layoutPositionedObjects(relayoutChildren || isRoot());
 
-    updateRegionsAndExclusionsAfterChildLayout(flowThread);
+    updateRegionsAndShapesAfterChildLayout(flowThread);
 
     if (!isFloatingOrOutOfFlowPositioned() && height() == 0) {
         // We are a block with no border and padding and a computed height

Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (151749 => 151750)


--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2013-06-19 20:11:26 UTC (rev 151750)
@@ -342,7 +342,7 @@
     RenderFlowThread* flowThread = flowThreadContainingBlock();
     if (logicalWidthChangedInRegions(flowThread))
         relayoutChildren = true;
-    if (updateRegionsAndExclusionsBeforeChildLayout(flowThread))
+    if (updateRegionsAndShapesBeforeChildLayout(flowThread))
         relayoutChildren = true;
 
     m_numberOfInFlowChildrenOnFirstLine = -1;
@@ -368,7 +368,7 @@
 
     layoutPositionedObjects(relayoutChildren || isRoot());
 
-    updateRegionsAndExclusionsAfterChildLayout(flowThread);
+    updateRegionsAndShapesAfterChildLayout(flowThread);
 
     repaintChildrenDuringLayoutIfMoved(oldChildRects);
     // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.

Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (151749 => 151750)


--- trunk/Source/WebCore/rendering/RenderGrid.cpp	2013-06-19 20:09:33 UTC (rev 151749)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp	2013-06-19 20:11:26 UTC (rev 151750)
@@ -153,7 +153,7 @@
     RenderFlowThread* flowThread = flowThreadContainingBlock();
     if (logicalWidthChangedInRegions(flowThread))
         relayoutChildren = true;
-    if (updateRegionsAndExclusionsBeforeChildLayout(flowThread))
+    if (updateRegionsAndShapesBeforeChildLayout(flowThread))
         relayoutChildren = true;
 
     LayoutSize previousSize = size();
@@ -171,7 +171,7 @@
 
     layoutPositionedObjects(relayoutChildren || isRoot());
 
-    updateRegionsAndExclusionsAfterChildLayout(flowThread);
+    updateRegionsAndShapesAfterChildLayout(flowThread);
 
     computeOverflow(oldClientAfterEdge);
     statePusher.pop();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to