[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 2cf8acfca2333f8fc54095cc648624ad51f50219
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 23:41:25 2011 +0000

    2011-01-12  Chris Marrin  <cmarrin at 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: http://svn.webkit.org/repository/webkit/trunk@75649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3bd3fac..4b38dcf 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-12  Chris Marrin  <cmarrin at 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 at 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 f131436..460dbba 100644
--- 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 maxAllowableDelta = 0.05;
+    const float maxAllowableDelta = 0.05f;
 
     // 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 ed04972..2e20c3f 100644
--- 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
+#else
+    UNUSED_PARAM(value);
 #endif
 }
 

-- 
WebKit Debian packaging