2011-01-12 Chris Marrin <cmarrin@apple.com>

        Unreviewed.

        Another build fix

        * platform/graphics/ca/GraphicsLayerCA.cpp:
        (WebCore::GraphicsLayerCA::clampedContentsScaleForScale):
        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
        (PlatformCALayer::setContentsScale):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3bd3facf1a24cc7c8248d1ed875dc8bdea348a64..4b38dcf8d7516b452cca9f6d9519d8841a87229c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-12  Chris Marrin  <cmarrin@apple.com>
+
+        Unreviewed.
+
+        Another build fix
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::clampedContentsScaleForScale):
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayer::setContentsScale):
+

 2011-01-11  Matthew Delaney  <mdelaney@apple.com>
 
         Reviewed by Simon Fraser.
 2011-01-11  Matthew Delaney  <mdelaney@apple.com>
 
         Reviewed by Simon Fraser.

diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
index f131436e1f34053fb6c2c5027a580a887e463683..460dbba0c88c36ab4fef8bf04513dd9c90ed153d 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -1915,7 +1915,7 @@ float GraphicsLayerCA::clampedContentsScaleForScale(float scale) const
     const float minScale = 0.01f;
     
     // Avoid very slight scale changes that would be doing extra work for no benefit
     const float minScale = 0.01f;
     
     // Avoid very slight scale changes that would be doing extra work for no benefit

-    const float maxAllowableDelta = 0.05;
+    const float maxAllowableDelta = 0.05f;

 
     // Clamp
     float result = max(minScale, min(scale, maxScale));
 
     // Clamp
     float result = max(minScale, min(scale, maxScale));

diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index ed04972882919d1d54e753ff0faff02f12c7af40..2e20c3f6026d34626160771226ceea1af7d201f4 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -738,6 +738,8 @@ void PlatformCALayer::setContentsScale(float value)
     BEGIN_BLOCK_OBJC_EXCEPTIONS
     [m_layer.get() setContentsScale:value];
     END_BLOCK_OBJC_EXCEPTIONS
     BEGIN_BLOCK_OBJC_EXCEPTIONS
     [m_layer.get() setContentsScale:value];
     END_BLOCK_OBJC_EXCEPTIONS

+#else
+    UNUSED_PARAM(value);

 #endif
 }
 
 #endif
 }