From e8fdd3b2a59b87f581ce4e6d74f24fcf83bb8865 Mon Sep 17 00:00:00 2001 From: "cmarrin@apple.com" Date: Wed, 12 Jan 2011 23:41:25 +0000 Subject: [PATCH] 2011-01-12 Chris Marrin 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 --- Source/WebCore/ChangeLog | 11 +++++++++++ .../WebCore/platform/graphics/ca/GraphicsLayerCA.cpp | 2 +- .../platform/graphics/ca/mac/PlatformCALayerMac.mm | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 3bd3facf1a24..4b38dcf8d751 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2011-01-12 Chris Marrin + + 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 Reviewed by Simon Fraser. diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp index f131436e1f34..460dbba0c88c 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 ed0497288291..2e20c3f6026d 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 } -- 2.36.0