Changeset 176455 in webkit

Timestamp:

Nov 21, 2014, 11:01:46 AM (12 years ago)

Author:

Chris Dumez

Message:

Regression(r175381): -webkit-mask-box-image is broken
​https://bugs.webkit.org/show_bug.cgi?id=138969
<rdar://problem/19054471>

Reviewed by Simon Fraser.

Source/WebCore:

After r175381, the StyleBuilder would call NinePieceImage::setMaskDefaults()
*after* calling CSSToStyleMap::mapNinePieceImage(), instead of *before*, for
-webkit-mask-box-image CSS property. This was causing the mask defaults to
overwrite what was set by mapNinePieceImage().

Test: fast/css/webkit-mask-box-image.html

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertBorderMask):

LayoutTests:

Add a layout test to add basic coverage for -webkit-mask-box-image
CSS property.

• fast/css/resources/mask.png: Added.
• fast/css/webkit-mask-box-image.html: Added.
• fast/css/webkit-mask-box-image-expected.html: Added

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/resources/mask.png (added)
• LayoutTests/fast/css/webkit-mask-box-image-expected.html (added)
• LayoutTests/fast/css/webkit-mask-box-image.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleBuilderConverter.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-21  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r175381): -webkit-mask-box-image is broken
+        https://bugs.webkit.org/show_bug.cgi?id=138969
+        <rdar://problem/19054471>
+
+        Reviewed by Simon Fraser.
+
+        Add a layout test to add basic coverage for -webkit-mask-box-image
+        CSS property.
+
+        * fast/css/resources/mask.png: Added.
+        * fast/css/webkit-mask-box-image.html: Added.
+        * fast/css/webkit-mask-box-image-expected.html: Added
+
 2014-11-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r175381): -webkit-mask-box-image is broken
+        https://bugs.webkit.org/show_bug.cgi?id=138969
+        <rdar://problem/19054471>
+
+        Reviewed by Simon Fraser.
+
+        After r175381, the StyleBuilder would call NinePieceImage::setMaskDefaults()
+        *after* calling CSSToStyleMap::mapNinePieceImage(), instead of *before*, for
+        -webkit-mask-box-image CSS property. This was causing the mask defaults to
+        overwrite what was set by mapNinePieceImage().
+
+        Test: fast/css/webkit-mask-box-image.html
+
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertBorderMask):
+
 2014-11-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -250 +250 @@
 inline NinePieceImage StyleBuilderConverter::convertBorderMask(StyleResolver& styleResolver, CSSValue& value)
 {
-    NinePieceImage image = convertBorderImage<property>(styleResolver, value);
+    NinePieceImage image;
     image.setMaskDefaults();
+    styleResolver.styleMap()->mapNinePieceImage(property, &value, image);
     return image;
 }