Modified: trunk/Source/WebCore/ChangeLog (126067 => 126068)
--- trunk/Source/WebCore/ChangeLog 2012-08-20 21:12:55 UTC (rev 126067)
+++ trunk/Source/WebCore/ChangeLog 2012-08-20 21:15:36 UTC (rev 126068)
@@ -1,3 +1,19 @@
+2012-08-20 Andrew Lo <[email protected]>
+
+ [BlackBerry] Enabling DEBUG_LAYER_ANIMATION results in build break & warnings
+ https://bugs.webkit.org/show_bug.cgi?id=94514
+
+ Reviewed by Rob Buis.
+
+ Add wtf::CString definition to fix build break when enabling DEBUG_LAYER_ANIMATION
+ debug prints. Fix build warnings from prints.
+
+ No new tests, non-functional change.
+
+ * platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
+ (WebCore::GraphicsLayerBlackBerry::addAnimation):
+ (WebCore::GraphicsLayerBlackBerry::pauseAnimation):
+
2012-08-20 Christophe Dumez <[email protected]>
[JSC] SerializedScriptValue::create() should throw a DataCloneError if input is an unsupported object
Modified: trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp (126067 => 126068)
--- trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp 2012-08-20 21:12:55 UTC (rev 126067)
+++ trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp 2012-08-20 21:15:36 UTC (rev 126068)
@@ -53,6 +53,10 @@
#include "LayerWebKitThread.h"
#include "NotImplemented.h"
+#if DEBUG_LAYER_ANIMATION
+#include <wtf/text/CString.h>
+#endif
+
namespace WebCore {
static void setLayerBorderColor(LayerWebKitThread& layer, const Color& color)
@@ -446,7 +450,7 @@
RefPtr<LayerAnimation> layerAnimation = LayerAnimation::create(values, boxSize, animation, animationName, timeOffset);
#if DEBUG_LAYER_ANIMATION
- fprintf(stderr, "LayerAnimation 0x%08x: Adding animation %s for property %d\n", layerAnimation.get(), animationName.latin1().data(), values.property());
+ fprintf(stderr, "LayerAnimation 0x%08x: Adding animation %s for property %d\n", (int)layerAnimation.get(), animationName.latin1().data(), values.property());
#endif
m_runningAnimations.append(layerAnimation);
@@ -462,7 +466,7 @@
while (RefPtr<LayerAnimation> animation = removeAnimationByName(animationName, m_runningAnimations)) {
#if DEBUG_LAYER_ANIMATION
- fprintf(stderr, "LayerAnimation 0x%08x: Pausing animation %s\n", animation.get(), animation->name().latin1().data());
+ fprintf(stderr, "LayerAnimation 0x%08x: Pausing animation %s\n", (int)animation.get(), animation->name().latin1().data());
#endif
// LayerAnimation is readonly. Create a new animation with the same data except for timeOffset.
@@ -475,7 +479,7 @@
m_suspendedAnimations.append(animation);
#if DEBUG_LAYER_ANIMATION
- fprintf(stderr, "LayerAnimation 0x%08x: Paused animation %s\n", animation.get(), animation->name().latin1().data());
+ fprintf(stderr, "LayerAnimation 0x%08x: Paused animation %s\n", (int)animation.get(), animation->name().latin1().data());
#endif
};
