Changeset 147250 in webkit

Timestamp:

Mar 29, 2013 2:13:02 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Exclusions] shape outside segments not properly calculated for ellipses
​https://bugs.webkit.org/show_bug.cgi?id=112587

Patch by Bem Jones-Bey <Bem Jones-Bey> on 2013-03-29
Reviewed by Julien Chaffraix.

Source/WebCore:

When converting the line top coordinates from the parent's coordinate
space to the coordinate space of the float, the offset given by the
shape was not being accounted for. This patch accounts for that
offset.

Test: fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::logicalLeftOffsetForLine): Fix the coordinate conversion.
(WebCore::RenderBlock::logicalRightOffsetForLine): Ditto.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded): Ditto.

LayoutTests:

Check that shapes with a non-zero y value are properly wrapped.

• fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html: Added.
• fast/exclusions/resources/rounded-rectangle.js:

(generateSimulatedShapeOutsideOnFloat): For simulating, we ignore the
x and y values, since we're not attempting to draw the float's content
in the right place, we just want to simulate the shape's effect.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/exclusions/resources/rounded-rectangle.js (modified) (1 diff)
• LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y-expected.html (added)
• LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-29  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Exclusions] shape outside segments not properly calculated for ellipses
+        https://bugs.webkit.org/show_bug.cgi?id=112587
+
+        Reviewed by Julien Chaffraix.
+
+        Check that shapes with a non-zero y value are properly wrapped.
+        
+        * fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html: Added.
+        * fast/exclusions/resources/rounded-rectangle.js:
+        (generateSimulatedShapeOutsideOnFloat): For simulating, we ignore the
+        x and y values, since we're not attempting to draw the float's content
+        in the right place, we just want to simulate the shape's effect.
+
 2013-03-29  Hans Muller  <hmuller@adobe.com>
 

trunk/LayoutTests/fast/exclusions/resources/rounded-rectangle.js

@@ -213 +213 @@
 
     element.insertAdjacentHTML('afterend', simulationHTML);
+    // For simulating, we ignore the x and y values, since we're not attempting
+    // to draw the float's content in the right place, we just want to simulate
+    // the shape's effect.
     if (floatValue == "right")
         dimensions.shapeX = -dimensions.shapeWidth;
-    simulateShapeOutline(elementId, stylesheet, dimensions);
-}
+    else 
+        dimensions.shapeX = 0;
+    dimensions.shapeY = 0;
+    simulateShapeOutline(elementId, stylesheet, dimensions);
+}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-29  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        [CSS Exclusions] shape outside segments not properly calculated for ellipses
+        https://bugs.webkit.org/show_bug.cgi?id=112587
+
+        Reviewed by Julien Chaffraix.
+
+        When converting the line top coordinates from the parent's coordinate
+        space to the coordinate space of the float, the offset given by the
+        shape was not being accounted for. This patch accounts for that
+        offset.
+
+        Test: fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::logicalLeftOffsetForLine): Fix the coordinate conversion.
+        (WebCore::RenderBlock::logicalRightOffsetForLine): Ditto.
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded): Ditto.
+
 2013-03-29  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4327 +4327 @@
         if (const FloatingObject* lastFloat = adapter.lastFloat()) {
             if (ExclusionShapeOutsideInfo* shapeOutside = lastFloat->renderer()->exclusionShapeOutsideInfo()) {
-                shapeOutside->computeSegmentsForLine(logicalTop - logicalTopForFloat(lastFloat), logicalHeight);
+                shapeOutside->computeSegmentsForLine(logicalTop - logicalTopForFloat(lastFloat) + shapeOutside->shapeLogicalTop(), logicalHeight);
                 left += shapeOutside->rightSegmentShapeBoundingBoxDelta();
             }
@@ -4384 +4384 @@
         if (const FloatingObject* lastFloat = adapter.lastFloat()) {
             if (ExclusionShapeOutsideInfo* shapeOutside = lastFloat->renderer()->exclusionShapeOutsideInfo()) {
-                shapeOutside->computeSegmentsForLine(logicalTop - logicalTopForFloat(lastFloat), logicalHeight);
+                shapeOutside->computeSegmentsForLine(logicalTop - logicalTopForFloat(lastFloat) + shapeOutside->shapeLogicalTop(), logicalHeight);
                 rightFloatOffset += shapeOutside->leftSegmentShapeBoundingBoxDelta();
             }

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -179 +179 @@
     ExclusionShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer()->exclusionShapeOutsideInfo();
     if (shapeOutsideInfo)
-        shapeOutsideInfo->computeSegmentsForLine(m_block->logicalHeight() - m_block->logicalTopForFloat(newFloat), logicalHeightForLine(m_block, m_isFirstLine));
+        shapeOutsideInfo->computeSegmentsForLine(m_block->logicalHeight() - m_block->logicalTopForFloat(newFloat) + shapeOutsideInfo->shapeLogicalTop(), logicalHeightForLine(m_block, m_isFirstLine));
 #endif