Title: [95031] trunk/Source/WebCore
- Revision
- 95031
- Author
- [email protected]
- Date
- 2011-09-13 10:31:54 -0700 (Tue, 13 Sep 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95030 => 95031)
--- trunk/Source/WebCore/ChangeLog 2011-09-13 16:44:15 UTC (rev 95030)
+++ trunk/Source/WebCore/ChangeLog 2011-09-13 17:31:54 UTC (rev 95031)
@@ -1,3 +1,17 @@
+2011-09-12 Ryosuke Niwa <[email protected]>
+
+ [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 <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (95030 => 95031)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-09-13 16:44:15 UTC (rev 95030)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-09-13 17:31:54 UTC (rev 95031)
@@ -3161,10 +3161,12 @@
case CSSPropertyWebkitBorderImage:
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)
return;
@@ -3176,8 +3178,8 @@
image.setBorderSlices(LengthBox()); // The slices default to auto.
}
mapNinePieceImage(property, value, image);
-
- if (id == CSSPropertyWebkitBorderImage)
+
+ if (id != CSSPropertyWebkitMaskBoxImage)
m_style->setBorderImage(image);
else
m_style->setMaskBoxImage(image);
@@ -4602,7 +4604,7 @@
// Set the image (this kicks off the load).
CSSPropertyID imageProperty;
- if (property == CSSPropertyWebkitBorderImage)
+ if (property == CSSPropertyWebkitBorderImage || property == CSSPropertyBorderImage)
imageProperty = CSSPropertyBorderImageSource;
else if (property == CSSPropertyWebkitMaskBoxImage)
imageProperty = CSSPropertyWebkitMaskBoxImageSource;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
