Changeset 143010 in webkit

Timestamp:

Feb 15, 2013 9:31:39 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Hans Muller <​hmuller@adobe.com> on 2013-02-15
Reviewed by Dirk Schulze.

Source/WebCore:

Removed the test that disabled circle values for shape-inside.
The remaining support for circles, 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-circle.html

• rendering/ExclusionShapeInsideInfo.h:

(WebCore::ExclusionShapeInsideInfo::isEnabledFor): Now only disallows ellipse.

LayoutTests:

Added a test for circle shape-inside values.

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-15  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside support for circles
+        https://bugs.webkit.org/show_bug.cgi?id=109713
+
+        Reviewed by Dirk Schulze.
+
+        Added a test for circle shape-inside values.
+
+        * fast/exclusions/shape-inside/shape-inside-circle-expected.html: Added.
+        * fast/exclusions/shape-inside/shape-inside-circle.html: Added.
+
 2013-02-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside support for circles
+        https://bugs.webkit.org/show_bug.cgi?id=109713
+
+        Reviewed by Dirk Schulze.
+
+        Removed the test that disabled circle values for shape-inside.
+        The remaining support for circles, 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-circle.html
+
+        * rendering/ExclusionShapeInsideInfo.h:
+        (WebCore::ExclusionShapeInsideInfo::isEnabledFor): Now only disallows ellipse.
+
 2013-02-15  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/rendering/ExclusionShapeInsideInfo.h

@@ -62 +62 @@
         ExclusionShapeValue* shapeValue = renderer->style()->shapeInside();
         BasicShape* shape = (shapeValue && shapeValue->type() == ExclusionShapeValue::SHAPE) ? shapeValue->shape() : 0;
-        return shape && (shape->type() == BasicShape::BASIC_SHAPE_RECTANGLE || shape->type() == BasicShape::BASIC_SHAPE_POLYGON);
+        return shape && shape->type() != BasicShape::BASIC_SHAPE_ELLIPSE;
     }
     bool lineOverlapsShapeBounds() const { return logicalLineTop() < shapeLogicalBottom() && logicalLineBottom() >= shapeLogicalTop(); }