Changeset 95031 in webkit

Timestamp:

Sep 13, 2011 10:31:54 AM (13 years ago)

Author:

rniwa@webkit.org

Message:

[CSS3 Backgrounds and Borders] Add unprefixed border-image shorthand.
​https://bugs.webkit.org/show_bug.cgi?id=67970

Reviewed by David Hyatt.

Also update CSSStyleSelector.cpp to support border-image to suppress assertion in
fast/borders/border-image-omit-right-slice.html

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
(WebCore::CSSStyleSelector::mapNinePieceImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [CSS3 Backgrounds and Borders] Add unprefixed border-image shorthand.
+        https://bugs.webkit.org/show_bug.cgi?id=67970
+
+        Reviewed by David Hyatt.
+
+        Also update CSSStyleSelector.cpp to support border-image to suppress assertion in
+        fast/borders/border-image-omit-right-slice.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        (WebCore::CSSStyleSelector::mapNinePieceImage):
+
 2011-09-13  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3162 +3162 @@
     case CSSPropertyWebkitMaskBoxImage: {
         if (isInherit) {
+            HANDLE_INHERIT_COND(CSSPropertyBorderImage, borderImage, BorderImage)
             HANDLE_INHERIT_COND(CSSPropertyWebkitBorderImage, borderImage, BorderImage)
             HANDLE_INHERIT_COND(CSSPropertyWebkitMaskBoxImage, maskBoxImage, MaskBoxImage)
             return;
         } else if (isInitial) {
+            HANDLE_INITIAL_COND_WITH_VALUE(CSSPropertyBorderImage, BorderImage, NinePieceImage)
             HANDLE_INITIAL_COND_WITH_VALUE(CSSPropertyWebkitBorderImage, BorderImage, NinePieceImage)
             HANDLE_INITIAL_COND_WITH_VALUE(CSSPropertyWebkitMaskBoxImage, MaskBoxImage, NinePieceImage)
@@ -3177 +3179 @@
         }
         mapNinePieceImage(property, value, image);
-        
-        if (id == CSSPropertyWebkitBorderImage)
+
+        if (id != CSSPropertyWebkitMaskBoxImage)
             m_style->setBorderImage(image);
         else
@@ -4603 +4605 @@
     // Set the image (this kicks off the load).
     CSSPropertyID imageProperty;
-    if (property == CSSPropertyWebkitBorderImage)
+    if (property == CSSPropertyWebkitBorderImage || property == CSSPropertyBorderImage)
         imageProperty = CSSPropertyBorderImageSource;
     else if (property == CSSPropertyWebkitMaskBoxImage)