Skip to site navigation (Press enter)

[webkit-changes] [102242] trunk/Source/WebCore

kling Wed, 07 Dec 2011 08:16:43 -0800

Title: [102242] trunk/Source/WebCore

Revision: 102242
Author: [email protected]
Date: 2011-12-07 08:16:34 -0800 (Wed, 07 Dec 2011)

Log Message

ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
<http://webkit.org/b/73998>


Reviewed by Antti Koivisto.

Have ApplyPropertyBorderImage call mapNinePieceImage() directly now that it's
public (instead of passing it as a template argument.)

* css/CSSStyleApplyProperty.cpp:
(WebCore::ApplyPropertyBorderImage::applyValue):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (102241 => 102242)


--- trunk/Source/WebCore/ChangeLog	2011-12-07 16:12:36 UTC (rev 102241)
+++ trunk/Source/WebCore/ChangeLog	2011-12-07 16:16:34 UTC (rev 102242)
@@ -1,3 +1,17 @@
+2011-12-07  Andreas Kling  <[email protected]>
+
+        ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
+        <http://webkit.org/b/73998>
+
+        Reviewed by Antti Koivisto.
+
+        Have ApplyPropertyBorderImage call mapNinePieceImage() directly now that it's
+        public (instead of passing it as a template argument.)
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyBorderImage::applyValue):
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+
 2011-12-07  Jessie Berlin  <[email protected]>
 
         Mac build fix after r102235.

Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (102241 => 102242)


--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-07 16:12:36 UTC (rev 102241)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp	2011-12-07 16:16:34 UTC (rev 102242)
@@ -611,8 +611,7 @@
 template <BorderImageType borderImageType,
           CSSPropertyID property,
           const NinePieceImage& (RenderStyle::*getterFunction)() const,
-          void (RenderStyle::*setterFunction)(const NinePieceImage&),
-          void (CSSStyleSelector::*mapNinePieceImage)(CSSPropertyID, CSSValue*, NinePieceImage&)>
+          void (RenderStyle::*setterFunction)(const NinePieceImage&)>
 class ApplyPropertyBorderImage {
 public:
     static void applyValue(CSSStyleSelector* selector, CSSValue* value)
@@ -620,7 +619,7 @@
         NinePieceImage image;
         if (borderImageType == Mask)
             image.setMaskDefaults();
-        (selector->*mapNinePieceImage)(property, value, image);
+        selector->mapNinePieceImage(property, value, image);
         (selector->style()->*setterFunction)(image);
     }
 
@@ -1350,9 +1349,9 @@
     setPropertyHandler(CSSPropertyBorderColor, ApplyPropertyExpanding<SuppressValue, CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor>::createHandler());
     setPropertyHandler(CSSPropertyBorder, ApplyPropertyExpanding<SuppressValue, CSSPropertyBorderStyle, CSSPropertyBorderWidth, CSSPropertyBorderColor>::createHandler());
 
-    setPropertyHandler(CSSPropertyBorderImage, ApplyPropertyBorderImage<Image, CSSPropertyBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage, &CSSStyleSelector::mapNinePieceImage>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImage<Image, CSSPropertyWebkitBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage, &CSSStyleSelector::mapNinePieceImage>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImage<Mask, CSSPropertyWebkitMaskBoxImage, &RenderStyle::maskBoxImage, &RenderStyle::setMaskBoxImage, &CSSStyleSelector::mapNinePieceImage>::createHandler());
+    setPropertyHandler(CSSPropertyBorderImage, ApplyPropertyBorderImage<Image, CSSPropertyBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImage<Image, CSSPropertyWebkitBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImage<Mask, CSSPropertyWebkitMaskBoxImage, &RenderStyle::maskBoxImage, &RenderStyle::setMaskBoxImage>::createHandler());
 
     setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<Image, Outset>::createHandler());
     setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<Mask, Outset>::createHandler());

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes