Changeset 95096 in webkit

Timestamp:

Sep 14, 2011, 9:45:23 AM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=68050

Regressions in some layout tests from making border/mask/reflection nine-piece-image
parsing match the spec, which allows any of the pieces to be omitted and to also be
specifiable in any order.

When the higher level code suddenly allowed the image slices to be omitted, the fixup
for legacy compatibility for reflections and masks in the parseBorderImageSlice function
no longer happened because that function no longer got called.

The fix is to properly set the defaults to include the "fill" keyword, so the fixup is
applied to the NinePieceImages you create before you ever map anything in from the rules.

This also has the side effect of fixing -webkit-max-box-image-slice to actually dump as
"0 fill" instead of just "0", which is the correct initial value for this property.

Reviewed by Adam Roben.

Source/WebCore:

• css/CSSParser.cpp:

(WebCore::CSSParser::parseBorderImageSlice):

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):

• rendering/style/StyleReflection.h:

(WebCore::StyleReflection::StyleReflection):

LayoutTests:

• fast/css/getComputedStyle/computed-style-expected.txt:
• fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
• svg/css/getComputedStyle-basic-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (modified) (1 diff)
• LayoutTests/svg/css/getComputedStyle-basic-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/NinePieceImage.h (modified) (1 diff)
• Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/StyleReflection.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-13  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68050
+        
+        Regressions in some layout tests from making border/mask/reflection nine-piece-image
+        parsing match the spec, which allows any of the pieces to be omitted and to also be
+        specifiable in any order.
+        
+        When the higher level code suddenly allowed the image slices to be omitted, the fixup
+        for legacy compatibility for reflections and masks in the parseBorderImageSlice function
+        no longer happened because that function no longer got called.
+        
+        The fix is to properly set the defaults to include the "fill" keyword, so the fixup is
+        applied to the NinePieceImages you create before you ever map anything in from the rules.
+        
+        This also has the side effect of fixing -webkit-max-box-image-slice to actually dump as
+        "0 fill" instead of just "0", which is the correct initial value for this property.
+
+        Reviewed by Adam Roben.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * svg/css/getComputedStyle-basic-expected.txt:
+
 2011-09-14  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

@@ -163 +163 @@
 -webkit-mask-box-image-outset: 0px;
 -webkit-mask-box-image-repeat: stretch;
--webkit-mask-box-image-slice: 0;
+-webkit-mask-box-image-slice: 0 fill;
 -webkit-mask-box-image-source: none;
 -webkit-mask-box-image-width: auto;

trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

@@ -162 +162 @@
     -webkit-mask-box-image-outset: 0px
     -webkit-mask-box-image-repeat: stretch
-    -webkit-mask-box-image-slice: 0
+    -webkit-mask-box-image-slice: 0 fill
     -webkit-mask-box-image-source: none
     -webkit-mask-box-image-width: auto

trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

@@ -323 +323 @@
 rect: style.getPropertyValue(-webkit-mask-box-image-repeat) : stretch
 rect: style.getPropertyCSSValue(-webkit-mask-box-image-repeat) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-mask-box-image-slice) : 0
+rect: style.getPropertyValue(-webkit-mask-box-image-slice) : 0 fill
 rect: style.getPropertyCSSValue(-webkit-mask-box-image-slice) : [object CSSValue]
 rect: style.getPropertyValue(-webkit-mask-box-image-source) : none
@@ -803 +803 @@
 g: style.getPropertyValue(-webkit-mask-box-image-repeat) : stretch
 g: style.getPropertyCSSValue(-webkit-mask-box-image-repeat) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-mask-box-image-slice) : 0
+g: style.getPropertyValue(-webkit-mask-box-image-slice) : 0 fill
 g: style.getPropertyCSSValue(-webkit-mask-box-image-slice) : [object CSSValue]
 g: style.getPropertyValue(-webkit-mask-box-image-source) : none

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-13  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68050
+        
+        Regressions in some layout tests from making border/mask/reflection nine-piece-image
+        parsing match the spec, which allows any of the pieces to be omitted and to also be
+        specifiable in any order.
+        
+        When the higher level code suddenly allowed the image slices to be omitted, the fixup
+        for legacy compatibility for reflections and masks in the parseBorderImageSlice function
+        no longer happened because that function no longer got called.
+        
+        The fix is to properly set the defaults to include the "fill" keyword, so the fixup is
+        applied to the NinePieceImages you create before you ever map anything in from the rules.
+        
+        This also has the side effect of fixing -webkit-max-box-image-slice to actually dump as
+        "0 fill" instead of just "0", which is the correct initial value for this property.
+
+        Reviewed by Adam Roben.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseBorderImageSlice):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        * rendering/style/StyleReflection.h:
+        (WebCore::StyleReflection::StyleReflection):
+
 2011-09-13  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5417 +5417 @@
     }
 
-    if (context.allowNumber() && !context.top() && (propId == CSSPropertyWebkitMaskBoxImage || propId == CSSPropertyWebkitBoxReflect)) {
-        // Allow the slices to be omitted for images that don't fit to a border.  We just set the slices to be 0.
-        context.setTop(primitiveValueCache()->createValue(0, CSSPrimitiveValue::CSS_NUMBER));
-        context.setAllowFinalCommit();
-    }
-
     if (context.allowFinalCommit()) {
         // FIXME: For backwards compatibility, -webkit-border-image, -webkit-mask-box-image and -webkit-box-reflect have to do a fill by default.

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3035 +3035 @@
 
         NinePieceImage image;
-        if (property == CSSPropertyWebkitMaskBoxImage) {
-            image.setImageSlices(LengthBox(0)); // For backwards compatibility, just make the mask box image slices 0 instead of 100%.
-            image.setBorderSlices(LengthBox()); // The slices default to auto.
-        }
+        if (property == CSSPropertyWebkitMaskBoxImage)
+            image.setMaskDefaults();
         mapNinePieceImage(property, value, image);
 
@@ -3178 +3176 @@
         }
         NinePieceImage mask;
-        mask.setImageSlices(LengthBox(0)); // For backwards compatibility, just make the mask box image slices 0 instead of 100%.
-        mask.setBorderSlices(LengthBox()); // The slices default to auto.
+        mask.setMaskDefaults();
         mapNinePieceImage(property, reflectValue->mask(), mask);
         reflection->setMask(mask);

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

@@ -113 +113 @@
     }
 
+    void setMaskDefaults()
+    {
+        m_imageSlices = LengthBox(0);
+        m_fill = true;
+        m_borderSlices = LengthBox();
+    }
+
 private:
     RefPtr<StyleImage> m_image;

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -65 +65 @@
     , m_regionBreakInside(RenderStyle::initialPageBreak())
 {
-    m_maskBoxImage.setImageSlices(LengthBox(0)); // Preserve the value of 0 for mask box image slices for backwards compatibility.
-    m_maskBoxImage.setBorderSlices(LengthBox()); // The border slices for a mask box image default to auto instead of 1.
+    m_maskBoxImage.setMaskDefaults();
 }
 

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

@@ -59 +59 @@
         , m_offset(0, Fixed)
     {
-         m_mask.setImageSlices(LengthBox(0)); // Preserve the value of 0 for mask image slices for backwards compatibility.
-         m_mask.setBorderSlices(LengthBox()); // The border slices for a mask image default to auto instead of 1.
+         m_mask.setMaskDefaults();
     }