Changeset 95242 in webkit

Timestamp:

Sep 15, 2011 4:45:25 PM (13 years ago)

Author:

hyatt@apple.com

Message:

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

Make sure that the border shorthand also resets border-image.

Reviewed by Beth Dakin.

Source/WebCore:

Added fast/borders/border-image-reset-by-border-shorthand.html.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

LayoutTests:

• fast/borders/border-image-reset-by-border-shorthand-expected.txt: Added.
• fast/borders/border-image-reset-by-border-shorthand.html: Added.
• fast/borders/border-image-scaled-gradient.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/border-image-reset-by-border-shorthand-expected.txt (added)
• LayoutTests/fast/borders/border-image-reset-by-border-shorthand.html (added)
• LayoutTests/fast/borders/border-image-scaled-gradient.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-15  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=27579
+        
+        Make sure that the border shorthand also resets border-image.
+
+        Reviewed by Beth Dakin.
+
+        * fast/borders/border-image-reset-by-border-shorthand-expected.txt: Added.
+        * fast/borders/border-image-reset-by-border-shorthand.html: Added.
+        * fast/borders/border-image-scaled-gradient.html:
+
 2011-09-15  David Levin  <levin@chromium.org>
 

trunk/LayoutTests/fast/borders/border-image-scaled-gradient.html

@@ -7 +7 @@
       width: 300px;
       height: 300px;
-      -webkit-border-image: -webkit-linear-gradient(30deg, black, white) 1 repeat;
+      border: 2px solid red;
       border-image: -webkit-linear-gradient(30deg, black, white) 1 fill repeat;
-      border: 2px solid red;
     }
       

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=27579
+        
+        Make sure that the border shorthand also resets border-image.
+
+        Reviewed by Beth Dakin.
+
+        Added fast/borders/border-image-reset-by-border-shorthand.html.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+
 2011-09-15  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1966 +1966 @@
         const int properties[3] = { CSSPropertyBorderWidth, CSSPropertyBorderStyle,
                                     CSSPropertyBorderColor };
-        return parseShorthand(propId, properties, 3, important);
+        if (parseShorthand(propId, properties, 3, important)) {
+            // The CSS3 Borders and Backgrounds specification says that border also resets border-image. It's as
+            // though a value of none was specified for the image.
+            addProperty(CSSPropertyBorderImage, CSSInitialValue::createImplicit(), important);
+            return true;
+        }
+        return false;
     }
     case CSSPropertyBorderTop: