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

Fri, 14 Sep 2012 15:25:32 -0700

Title: [128660] trunk/Source/WebCore
Revision
128660
Author
[email protected]
Date
2012-09-14 15:26:25 -0700 (Fri, 14 Sep 2012)

Log Message

Fix builds with CSS_IMAGE_RESOLUTION enabled after r128656.

* css/StyleBuilder.cpp:
(WebCore::ApplyPropertyImageResolution::applyInheritValue):
(WebCore::ApplyPropertyImageResolution::applyInitialValue):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (128659 => 128660)


--- trunk/Source/WebCore/ChangeLog	2012-09-14 22:21:31 UTC (rev 128659)
+++ trunk/Source/WebCore/ChangeLog	2012-09-14 22:26:25 UTC (rev 128660)
@@ -1,3 +1,11 @@
+2012-09-14  Simon Fraser  <[email protected]>
+
+        Fix builds with CSS_IMAGE_RESOLUTION enabled after r128656.
+
+        * css/StyleBuilder.cpp:
+        (WebCore::ApplyPropertyImageResolution::applyInheritValue):
+        (WebCore::ApplyPropertyImageResolution::applyInitialValue):
+
 2012-09-14  Adam Barth  <[email protected]>
 
         Remove webkitPostMessage

Modified: trunk/Source/WebCore/css/StyleBuilder.cpp (128659 => 128660)


--- trunk/Source/WebCore/css/StyleBuilder.cpp	2012-09-14 22:21:31 UTC (rev 128659)
+++ trunk/Source/WebCore/css/StyleBuilder.cpp	2012-09-14 22:26:25 UTC (rev 128660)
@@ -1735,18 +1735,18 @@
 #if ENABLE(CSS_IMAGE_RESOLUTION)
 class ApplyPropertyImageResolution {
 public:
-    static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
+    static void applyInheritValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
     {
-        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInheritValue(styleResolver);
-        ApplyPropertyDefaultBase<ImageResolutionSnap, &RenderStyle::imageResolutionSnap, ImageResolutionSnap, &RenderStyle::setImageResolutionSnap, ImageResolutionSnap, &RenderStyle::initialImageResolutionSnap>::applyInheritValue(styleResolver);
-        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInheritValue(styleResolver);
+        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInheritValue(propertyID, styleResolver);
+        ApplyPropertyDefaultBase<ImageResolutionSnap, &RenderStyle::imageResolutionSnap, ImageResolutionSnap, &RenderStyle::setImageResolutionSnap, ImageResolutionSnap, &RenderStyle::initialImageResolutionSnap>::applyInheritValue(propertyID, styleResolver);
+        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInheritValue(propertyID, styleResolver);
     }
 
-    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
+    static void applyInitialValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
     {
-        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInitialValue(styleResolver);
-        ApplyPropertyDefaultBase<ImageResolutionSnap, &RenderStyle::imageResolutionSnap, ImageResolutionSnap, &RenderStyle::setImageResolutionSnap, ImageResolutionSnap, &RenderStyle::initialImageResolutionSnap>::applyInitialValue(styleResolver);
-        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInitialValue(styleResolver);
+        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInitialValue(propertyID, styleResolver);
+        ApplyPropertyDefaultBase<ImageResolutionSnap, &RenderStyle::imageResolutionSnap, ImageResolutionSnap, &RenderStyle::setImageResolutionSnap, ImageResolutionSnap, &RenderStyle::initialImageResolutionSnap>::applyInitialValue(propertyID, styleResolver);
+        ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInitialValue(propertyID, styleResolver);
     }
 
     static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)

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

Reply via email to