Changeset 143225 in webkit

Timestamp:

Feb 18, 2013 8:48:39 AM (11 years ago)

Author:

betravis@adobe.com

Message:

[CSS Exclusions] Support outside-shape layout for shape-inside property
​https://bugs.webkit.org/show_bug.cgi?id=102571

Reviewed by David Hyatt.

Source/WebCore:

A shape-inside value of 'outside-shape' should resolve to the value of
the shape-outside property for layout. This patch introduces a helper
method to resolve shape-inside in RenderStyle, and replaces calls to
RenderStyle::shapeInside() when the resolved (layout) value should be
used.

Test: fast/exclusions/shape-inside/shape-inside-outside-shape.html

• rendering/ExclusionShapeInfo.cpp:

(WebCore::::computedShape): Use the resolved shape-inside getter.

• rendering/ExclusionShapeInsideInfo.h:

(WebCore::ExclusionShapeInsideInfo::isEnabledFor): Ditto.
(WebCore::ExclusionShapeInsideInfo::ExclusionShapeInsideInfo): Ditto.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::styleDidChange): Ditto.
(WebCore::RenderBlock::exclusionShapeInsideInfo): Ditto.

• rendering/style/RenderStyle.h: Add the resolved shape inside getter.

LayoutTests:

Test that the shape-outside value correctly propagates to shape-inside
when shape-inside has a value of 'outside-shape,' using both an
undefined and a simple shape outside value.

• fast/exclusions/shape-inside/shape-inside-outside-shape-expected.html: Added.
• fast/exclusions/shape-inside/shape-inside-outside-shape.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-outside-shape-expected.html (added)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-outside-shape.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/ExclusionShapeInfo.cpp (modified) (1 diff)
• Source/WebCore/rendering/ExclusionShapeInsideInfo.h (modified) (3 diffs)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-18  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions] Support outside-shape layout for shape-inside property
+        https://bugs.webkit.org/show_bug.cgi?id=102571
+
+        Reviewed by David Hyatt.
+
+        Test that the shape-outside value correctly propagates to shape-inside
+        when shape-inside has a value of 'outside-shape,' using both an
+        undefined and a simple shape outside value.
+
+        * fast/exclusions/shape-inside/shape-inside-outside-shape-expected.html: Added.
+        * fast/exclusions/shape-inside/shape-inside-outside-shape.html: Added.
+
 2013-02-18  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions] Support outside-shape layout for shape-inside property
+        https://bugs.webkit.org/show_bug.cgi?id=102571
+
+        Reviewed by David Hyatt.
+
+        A shape-inside value of 'outside-shape' should resolve to the value of
+        the shape-outside property for layout. This patch introduces a helper
+        method to resolve shape-inside in RenderStyle, and replaces calls to
+        RenderStyle::shapeInside() when the resolved (layout) value should be
+        used.
+
+        Test: fast/exclusions/shape-inside/shape-inside-outside-shape.html
+
+        * rendering/ExclusionShapeInfo.cpp:
+        (WebCore::::computedShape): Use the resolved shape-inside getter.
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor): Ditto.
+        (WebCore::ExclusionShapeInsideInfo::ExclusionShapeInsideInfo): Ditto.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::styleDidChange): Ditto.
+        (WebCore::RenderBlock::exclusionShapeInsideInfo): Ditto.
+        * rendering/style/RenderStyle.h: Add the resolved shape inside getter.
+
 2013-02-18  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/ExclusionShapeInfo.cpp

@@ -55 +55 @@
 }
 
-template class ExclusionShapeInfo<RenderBlock, &RenderStyle::shapeInside>;
+template class ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside>;
 template class ExclusionShapeInfo<RenderBox, &RenderStyle::shapeOutside>;
 }

trunk/Source/WebCore/rendering/ExclusionShapeInsideInfo.h

@@ -53 +53 @@
 typedef Vector<LineSegmentRange> SegmentRangeList;
 
-class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::shapeInside>, public MappedInfo<RenderBlock, ExclusionShapeInsideInfo> {
+class ExclusionShapeInsideInfo : public ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside>, public MappedInfo<RenderBlock, ExclusionShapeInsideInfo> {
 public:
     static PassOwnPtr<ExclusionShapeInsideInfo> createInfo(const RenderBlock* renderer) { return adoptPtr(new ExclusionShapeInsideInfo(renderer)); }
@@ -60 +60 @@
     {
         // FIXME: Bug 89707: Enable shape inside for non-rectangular shapes
-        ExclusionShapeValue* shapeValue = renderer->style()->shapeInside();
+        ExclusionShapeValue* shapeValue = renderer->style()->resolvedShapeInside();
         BasicShape* shape = (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
         return shape && shape->type() != BasicShape::BASIC_SHAPE_ELLIPSE;
@@ -90 +90 @@
 
 private:
-    ExclusionShapeInsideInfo(const RenderBlock* renderer) : ExclusionShapeInfo<RenderBlock, &RenderStyle::shapeInside>(renderer) { }
+    ExclusionShapeInsideInfo(const RenderBlock* renderer) : ExclusionShapeInfo<RenderBlock, &RenderStyle::resolvedShapeInside>(renderer) { }
 
     LayoutUnit m_shapeLineTop;

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -345 +345 @@
     // FIXME: Bug 89993: Style changes should affect the ExclusionShapeInsideInfos for other render blocks that
     // share the same ExclusionShapeInsideInfo
-    updateExclusionShapeInsideInfoAfterStyleChange(style()->shapeInside(), oldStyle ? oldStyle->shapeInside() : 0);
+    updateExclusionShapeInsideInfoAfterStyleChange(style()->resolvedShapeInside(), oldStyle ? oldStyle->resolvedShapeInside() : 0);
 #endif
 
@@ -1374 +1374 @@
 ExclusionShapeInsideInfo* RenderBlock::exclusionShapeInsideInfo() const
 {
-    return style()->shapeInside() && ExclusionShapeInsideInfo::isEnabledFor(this) ? ExclusionShapeInsideInfo::info(this) : 0;
+    return style()->resolvedShapeInside() && ExclusionShapeInsideInfo::isEnabledFor(this) ? ExclusionShapeInsideInfo::info(this) : 0;
 }
 

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1422 +1422 @@
     }
     ExclusionShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside.get(); }
+    ExclusionShapeValue* resolvedShapeInside() const
+    {
+        ExclusionShapeValue* shapeInside = this->shapeInside();
+        if (shapeInside && shapeInside->type() == ExclusionShapeValue::OUTSIDE)
+            return shapeOutside();
+        return shapeInside;
+    }
 
     void setShapeOutside(PassRefPtr<ExclusionShapeValue> value)