Changeset 143420 in webkit

Timestamp:

Feb 19, 2013 5:56:15 PM (11 years ago)

Author:

hmuller@adobe.com

Message:

[CSS Exclusions] Enable shape-inside support for ellipses
​https://bugs.webkit.org/show_bug.cgi?id=109868

Reviewed by Dirk Schulze.

Source/WebCore:

This change is very similar to the one recently made for circles:
removed the test that disabled ellipse values for shape-inside.
The remaining support for ellipses, which is based on rounded rectangles
whose width/height is equal to their radiusX/radiusY, has not changed.

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

• rendering/ExclusionShapeInsideInfo.h:

(WebCore::ExclusionShapeInsideInfo::isEnabledFor): No longer disallows any BasicShape type.

LayoutTests:

Added a test for ellipse shape-inside values.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-ellipse-expected.html (added)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-ellipse.html (added)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• Source/WebCore/rendering/ExclusionShapeInsideInfo.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-19  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside support for ellipses
+        https://bugs.webkit.org/show_bug.cgi?id=109868
+
+        Reviewed by Dirk Schulze.
+
+        Added a test for ellipse shape-inside values.
+
+        * fast/exclusions/shape-inside/shape-inside-ellipse-expected.html: Added.
+        * fast/exclusions/shape-inside/shape-inside-ellipse.html: Added.
+
 2013-02-19  Uday Kiran  <udaykiran@motorola.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside support for ellipses
+        https://bugs.webkit.org/show_bug.cgi?id=109868
+
+        Reviewed by Dirk Schulze.
+
+        This change is very similar to the one recently made for circles:
+        removed the test that disabled ellipse values for shape-inside.
+        The remaining support for ellipses, which is based on rounded rectangles
+        whose width/height is equal to their radiusX/radiusY, has not changed.
+
+        Test: fast/exclusions/shape-inside/shape-inside-ellipse.html
+
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor): No longer disallows any BasicShape type.
+
 2013-02-19  Uday Kiran  <udaykiran@motorola.com>
 
@@ -258 +275 @@
         (WebCore::HTMLDocumentParser::prepareToStopParsing):
         (WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd):
+
+2013-02-19  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside support for ellipses
+        https://bugs.webkit.org/show_bug.cgi?id=109868
+
+        Reviewed by Dirk Schulze.
+
+        This change is very similar to the one recently made for circles:
+        removed the test that disabled ellipse values for shape-inside.
+        The remaining support for ellipses, which is based on rounded rectangles
+        whose width/height is equal to their radiusX/radiusY, has not changed.
+
+        Test: fast/exclusions/shape-inside/shape-inside-ellipse.html
+
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor): No longer disallows any BasicShape type.
 
 2013-02-19  Simon Fraser  <simon.fraser@apple.com>

trunk/Source/WebCore/rendering/ExclusionShapeInsideInfo.h

@@ -59 +59 @@
     static bool isEnabledFor(const RenderBlock* renderer)
     {
-        // FIXME: Bug 89707: Enable shape inside for non-rectangular shapes
         ExclusionShapeValue* shapeValue = renderer->style()->resolvedShapeInside();
-        BasicShape* shape = (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
-        return shape && shape->type() != BasicShape::BASIC_SHAPE_ELLIPSE;
+        return (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
     }
     bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && logicalLineBottom() >= shapeLogicalTop(); }