Changeset 154152 in webkit

Timestamp:

Aug 15, 2013 4:47:18 PM (11 years ago)

Author:

hmuller@adobe.com

Message:

[CSS Shapes] Add support for shape-outside image values
​https://bugs.webkit.org/show_bug.cgi?id=119809

Source/WebCore:

Added minimal support for shape-outside image values. A new method that computes
the excluded intervals for a horizontal line segment was added to the RasterIntervals
class. The stub RasterShape getExcludedIntervals() method has been replaced by
one that uses the new method.

Image shapes are represented by a RasterIntervals object, which just encapsulates a
Region object. The new getExcludedIntervals() method computes the excluded intervals
for a horizontal line segment between y1 and y2. To find the excluded intervals we
vertically expand each of the image shape Region's rectangles that fall within the line
segment, so that they begin at y1 and have height = y2 - y1. The union of the expanded
rectangles produces a new Region whose horizontal projection defines the excluded intervals.

Reviewed by Alexandru Chiculita.

Tests: fast/shapes/shape-outside-floats/shape-outside-floats-image-001.html

fast/shapes/shape-outside-floats/shape-outside-floats-image-002.html

• rendering/shapes/RasterShape.cpp:

(WebCore::RasterShapeIntervals::getExcludedIntervals): See above.
(WebCore::RasterShape::getExcludedIntervals): Stub method has been replaced by one that uses RasterShapeIntervals::getExcludedIntervals().

• rendering/shapes/RasterShape.h:
• rendering/shapes/ShapeOutsideInfo.cpp:

(WebCore::ShapeOutsideInfo::isEnabledFor): Enable Image valued shapes.

LayoutTests:

Two tests to verify that the initial implementation of shape valued images is working
for shape-outside.

Reviewed by Alexandru Chiculita.

• fast/shapes/shape-outside-floats/shape-outside-floats-image-001-expected.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-floats-image-001.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-floats-image-002-expected.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-floats-image-002.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-image-001-expected.html (added)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-image-001.html (added)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-image-002-expected.html (added)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-image-002.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/shapes/RasterShape.cpp (modified) (2 diffs)
• Source/WebCore/rendering/shapes/RasterShape.h (modified) (1 diff)
• Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-15  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] Add support for shape-outside image values
+        https://bugs.webkit.org/show_bug.cgi?id=119809
+
+        Two tests to verify that the initial implementation of shape valued images is working
+        for shape-outside.
+
+        Reviewed by Alexandru Chiculita.
+
+        * fast/shapes/shape-outside-floats/shape-outside-floats-image-001-expected.html: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-image-001.html: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-image-002-expected.html: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-floats-image-002.html: Added.
+
 2013-08-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-15  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] Add support for shape-outside image values
+        https://bugs.webkit.org/show_bug.cgi?id=119809
+
+        Added minimal support for shape-outside image values. A new method that computes
+        the excluded intervals for a horizontal line segment was added to the RasterIntervals
+        class. The stub RasterShape getExcludedIntervals() method has been replaced by
+        one that uses the new method.
+
+        Image shapes are represented by a RasterIntervals object, which just encapsulates a
+        Region object. The new getExcludedIntervals() method computes the excluded intervals
+        for a horizontal line segment between y1 and y2. To find the excluded intervals we
+        vertically expand each of the image shape Region's rectangles that fall within the line
+        segment, so that they begin at y1 and have height = y2 - y1. The union of the expanded
+        rectangles produces a new Region whose horizontal projection defines the excluded intervals.
+
+        Reviewed by Alexandru Chiculita.
+
+        Tests: fast/shapes/shape-outside-floats/shape-outside-floats-image-001.html
+               fast/shapes/shape-outside-floats/shape-outside-floats-image-002.html
+
+        * rendering/shapes/RasterShape.cpp:
+        (WebCore::RasterShapeIntervals::getExcludedIntervals): See above.
+        (WebCore::RasterShape::getExcludedIntervals): Stub method has been replaced by one that uses RasterShapeIntervals::getExcludedIntervals().
+        * rendering/shapes/RasterShape.h:
+        * rendering/shapes/ShapeOutsideInfo.cpp:
+        (WebCore::ShapeOutsideInfo::isEnabledFor): Enable Image valued shapes.
+
 2013-08-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/shapes/RasterShape.cpp

@@ -89 +89 @@
 }
 
+void RasterShapeIntervals::getExcludedIntervals(int y1, int y2, SegmentList& result) const
+{
+    ASSERT(y2 >= y1);
+
+    IntRect lineRect(bounds().x(), y1, bounds().width(), y2 - y1);
+    Region lineRegion(lineRect);
+    lineRegion.intersect(m_region);
+    if (lineRegion.isEmpty())
+        return;
+
+    Vector<IntRect> lineRects = lineRegion.rects();
+    ASSERT(lineRects.size() > 0);
+
+    Region segmentsRegion;
+    for (unsigned i = 0; i < lineRects.size(); i++)
+        segmentsRegion.unite(Region(alignedRect(lineRects[i], y1, y2)));
+
+    Vector<IntRect> segmentRects = segmentsRegion.rects();
+    for (unsigned i = 0; i < segmentRects.size(); i++)
+        result.append(LineSegment(segmentRects[i].x(), segmentRects[i].maxX() + 1));
+}
+
 const RasterShapeIntervals& RasterShape::marginIntervals() const
 {
@@ -109 +131 @@
 }
 
-void RasterShape::getExcludedIntervals(LayoutUnit, LayoutUnit, SegmentList&) const
+void RasterShape::getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalHeight, SegmentList& result) const
 {
-    // FIXME: this method is only a stub, see https://bugs.webkit.org/show_bug.cgi?id=119809.
+    const RasterShapeIntervals& intervals = marginIntervals();
+    if (intervals.isEmpty())
+        return;
+
+    float y1 = logicalTop;
+    float y2 = logicalTop + logicalHeight;
+
+    if (y2 < intervals.bounds().y() || y1 >= intervals.bounds().maxY())
+        return;
+
+    intervals.getExcludedIntervals(y1, y2, result);
 }
 

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

@@ -47 +47 @@
     void addInterval(int y, int x1, int x2);
     void getIncludedIntervals(int y1, int y2, SegmentList&) const;
+    void getExcludedIntervals(int y1, int y2, SegmentList&) const;
 
 private:

trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp

@@ -47 +47 @@
         return shapeValue->shape();
     case ShapeValue::Image:
-        return false; // FIXME, see https://bugs.webkit.org/show_bug.cgi?id=119809.
+        return shapeValue->isImageValid();
     default:
         return false;