ApplyPropertyBorderImage: Remove unneeded template argument for mapNinePieceImage().
authorkling@webkit.org <kling@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2011 16:16:34 +0000 (16:16 +0000)
committerkling@webkit.org <kling@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2011 16:16:34 +0000 (16:16 +0000)
<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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@102242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 353225e..c0068a3 100644 (file)
@@ -1,3 +1,17 @@
+2011-12-07  Andreas Kling  <kling@webkit.org>
+
+        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  <jberlin@apple.com>
 
         Mac build fix after r102235.
index 14564f0..8168be7 100644 (file)
@@ -611,8 +611,7 @@ enum BorderImageType { Image = 0, Mask };
 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 @@ public:
         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 @@ CSSStyleApplyProperty::CSSStyleApplyProperty()
     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());