Changeset 155655 in webkit

Timestamp:

Sep 12, 2013 3:55:59 PM (11 years ago)

Author:

zoltan@webkit.org

Message:

[CSS Shapes] Rename shapeContainingBlockHeight to shapeContainingBlockLogicalHeight
​https://bugs.webkit.org/show_bug.cgi?id=121252

Reviewed by Oliver Hunt.

No new tests, no behavior change.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::pushShapeContentOverflowBelowTheContentBox):

• rendering/shapes/ShapeInfo.h:

(WebCore::ShapeInfo::shapeContainingBlockLogicalHeight):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)
• rendering/shapes/ShapeInfo.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-12  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Shapes] Rename shapeContainingBlockHeight to shapeContainingBlockLogicalHeight
+        https://bugs.webkit.org/show_bug.cgi?id=121252
+
+        Reviewed by Oliver Hunt.
+
+        No new tests, no behavior change.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::pushShapeContentOverflowBelowTheContentBox):
+        * rendering/shapes/ShapeInfo.h:
+        (WebCore::ShapeInfo::shapeContainingBlockLogicalHeight):
+
 2013-09-12  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1408 +1408 @@
     LayoutUnit logicalLineBottom = lineTop + lineHeight;
     LayoutUnit shapeLogicalBottom = shapeInsideInfo->shapeLogicalBottom();
-    LayoutUnit shapeContainingBlockHeight = shapeInsideInfo->shapeContainingBlockHeight();
-
-    bool isOverflowPositionedAlready = (shapeContainingBlockHeight - shapeInsideInfo->owner()->borderAndPaddingAfter() + lineHeight) <= lineTop;
+    LayoutUnit shapeContainingBlockLogicalHeight = shapeInsideInfo->shapeContainingBlockLogicalHeight();
+
+    bool isOverflowPositionedAlready = (shapeContainingBlockLogicalHeight - shapeInsideInfo->owner()->borderAndPaddingAfter() + lineHeight) <= lineTop;
 
     // If the last line overlaps with the shape, we don't need the segments anymore
@@ -1416 +1416 @@
         shapeInsideInfo->clearSegments();
 
-    if (logicalLineBottom <= shapeLogicalBottom || !shapeContainingBlockHeight || isOverflowPositionedAlready)
+    if (logicalLineBottom <= shapeLogicalBottom || !shapeContainingBlockLogicalHeight || isOverflowPositionedAlready)
         return;
 
-    LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockHeight - (lineTop + shapeInsideInfo->owner()->borderAndPaddingAfter()));
+    LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockLogicalHeight - (lineTop + shapeInsideInfo->owner()->borderAndPaddingAfter()));
     block->setLogicalHeight(newLogicalHeight);
 }

trunk/Source/WebCore/rendering/shapes/ShapeInfo.h

@@ -97 +97 @@
     LayoutUnit logicalLineBottom() const { return m_shapeLineTop + m_lineHeight + logicalTopOffset(); }
 
-    LayoutUnit shapeContainingBlockHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
+    LayoutUnit shapeContainingBlockLogicalHeight() const { return (m_renderer->style()->boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
 
     bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && shapeLogicalTop() <= logicalLineBottom(); }