Changeset 156097 in webkit

Timestamp:

Sep 19, 2013 7:41:36 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Masking/Background] Position property should be ignored when using repeat: space
​https://bugs.webkit.org/show_bug.cgi?id=120623

Source/WebCore:

The background/mask-position should be ignored when using repeat: space,
unless there is not enough space for two copies of the image. In that case,
only one image is placed and background/mask-position determines its position.

Patch by Andrei Parvu <​parvu@adobe.com> on 2013-09-19
Reviewed by Dirk Schulze.

Test: css3/masking/mask-repeat-one-copy.html

• rendering/RenderBoxModelObject.cpp: Ignored position property if space value is positive, set no-repeat otherwise.

(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):

LayoutTests:

Patch by Andrei Parvu <​parvu@adobe.com> on 2013-09-19
Reviewed by Dirk Schulze.

• css3/masking/mask-repeat-one-copy-expected.html:
• css3/masking/mask-repeat-one-copy.html: Only one copy of the mask should be drawn, and background position should determine its position.
• css3/masking/mask-repeat-space-padding.html: Added a mask-position which should be ignored.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/masking/mask-repeat-one-copy-expected.html (copied) (copied from trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html) (1 diff)
• LayoutTests/css3/masking/mask-repeat-one-copy.html (copied) (copied from trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html) (1 diff)
• LayoutTests/css3/masking/mask-repeat-space-padding.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-19  Andrei Parvu  <parvu@adobe.com>
+
+        [CSS Masking/Background] Position property should be ignored when using repeat: space
+        https://bugs.webkit.org/show_bug.cgi?id=120623
+
+        Reviewed by Dirk Schulze.
+
+        * css3/masking/mask-repeat-one-copy-expected.html:
+        * css3/masking/mask-repeat-one-copy.html: Only one copy of the mask should be drawn, and background position should determine its position.
+        * css3/masking/mask-repeat-space-padding.html: Added a mask-position which should be ignored.
+
 2013-09-19  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/LayoutTests/css3/masking/mask-repeat-one-copy-expected.html

@@ -15 +15 @@
                 padding: 50px;
                 -webkit-mask-image: url("resources/circle.png");
-                -webkit-mask-size: 153px 127px;
-                -webkit-mask-repeat: space;
+                -webkit-mask-size: 400px 300px;
+                -webkit-mask-repeat: no-repeat;
                 -webkit-mask-origin: padding-box;
+                -webkit-mask-position: 100px 100px;
                 -webkit-mask-clip: padding-box;
             }

trunk/LayoutTests/css3/masking/mask-repeat-one-copy.html

@@ -15 +15 @@
                 padding: 50px;
                 -webkit-mask-image: url("resources/circle.png");
-                -webkit-mask-size: 153px 127px;
+                -webkit-mask-size: 400px 300px;
                 -webkit-mask-repeat: space;
                 -webkit-mask-origin: padding-box;
+                -webkit-mask-position: 100px 100px;
                 -webkit-mask-clip: padding-box;
             }

trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html

@@ -18 +18 @@
                 -webkit-mask-repeat: space;
                 -webkit-mask-origin: padding-box;
+                -webkit-mask-position: 150px 150px; /* This should be igonored because of repeat: space */
                 -webkit-mask-clip: padding-box;
             }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-19  Andrei Parvu  <parvu@adobe.com>
+
+        [CSS Masking/Background] Position property should be ignored when using repeat: space
+        https://bugs.webkit.org/show_bug.cgi?id=120623
+
+        The background/mask-position should be ignored when using repeat: space,
+        unless there is not enough space for two copies of the image. In that case,
+        only one image is placed and background/mask-position determines its position.
+
+        Reviewed by Dirk Schulze.
+
+        Test: css3/masking/mask-repeat-one-copy.html
+
+        * rendering/RenderBoxModelObject.cpp: Ignored position property if space value is positive, set no-repeat otherwise.
+        (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+
 2013-09-19  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1038 +1038 @@
 {
     int numberOfTiles = areaSize / tileSize;
-    int space = 0;
+    int space = -1;
 
     if (numberOfTiles > 1)
@@ -1158 +1158 @@
         int actualWidth = geometry.tileSize().width() + space;
 
-        geometry.setSpaceSize(FloatSize(space, 0));
-        geometry.setPhaseX(actualWidth ? actualWidth - roundToInt(computedXPosition + left) % actualWidth : 0);
-    } else if (backgroundRepeatX == NoRepeatFill) {
+        if (space >= 0) {
+            computedXPosition = minimumValueForLength(Length(), availableWidth, &view(), true);
+            geometry.setSpaceSize(FloatSize(space, 0));
+            geometry.setPhaseX(actualWidth ? actualWidth - roundToInt(computedXPosition + left) % actualWidth : 0);
+        } else
+            backgroundRepeatX = NoRepeatFill;
+    }
+    if (backgroundRepeatX == NoRepeatFill) {
         int xOffset = fillLayer->backgroundXOrigin() == RightEdge ? availableWidth - computedXPosition : computedXPosition;
         geometry.setNoRepeatX(left + xOffset);
@@ -1173 +1178 @@
         int actualHeight = geometry.tileSize().height() + space;
 
-        geometry.setSpaceSize(FloatSize(geometry.spaceSize().width(), space));
-        geometry.setPhaseY(actualHeight ? actualHeight - roundToInt(computedYPosition + top) % actualHeight : 0);
-    } else if (backgroundRepeatY == NoRepeatFill) {
+        if (space >= 0) {
+            computedYPosition = minimumValueForLength(Length(), availableHeight, &view(), true);
+            geometry.setSpaceSize(FloatSize(geometry.spaceSize().width(), space));
+            geometry.setPhaseY(actualHeight ? actualHeight - roundToInt(computedYPosition + top) % actualHeight : 0);
+        } else
+            backgroundRepeatY = NoRepeatFill;
+    }
+    if (backgroundRepeatY == NoRepeatFill) {
         int yOffset = fillLayer->backgroundYOrigin() == BottomEdge ? availableHeight - computedYPosition : computedYPosition;
         geometry.setNoRepeatY(top + yOffset);