The following commit has been merged in the debian/experimental branch:
commit 7ea757b3c5fc840b0f95a4c4d5c6d476e8b7ca11
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 6 22:01:14 2010 +0000
2010-12-06 Ryosuke Niwa <rniwa at webkit.org>
Yet unreviewed another Leopard build fix for r73380.
* platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
(PlatformCAAnimation::setKeyTimes):
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayer::platformCALayer):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73399 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cff2011..907a3e8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-06 Ryosuke Niwa <rniwa at webkit.org>
+
+ Yet unreviewed another Leopard build fix for r73380.
+
+ * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+ (PlatformCAAnimation::setKeyTimes):
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayer::platformCALayer):
+
2010-12-06 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
index 163a8f3..2967d18 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
@@ -562,7 +562,7 @@ void PlatformCAAnimation::setKeyTimes(const Vector<float>& value)
{
NSMutableArray* array = [NSMutableArray array];
- for (size_t i; i < value.size(); ++i)
+ for (size_t i = 0; i < value.size(); ++i)
[array addObject:[NSNumber numberWithFloat:value[i]]];
[static_cast<CAKeyframeAnimation*>(m_animation.get()) setKeyTimes:array];
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index ed8417e..00a8fe6 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -237,7 +237,7 @@ PlatformCALayer* PlatformCALayer::platformCALayer(void* platformLayer)
return 0;
// Pointer to PlatformCALayer is kept in a key of the CALayer
- PlatformCALayer* platformCALayer;
+ PlatformCALayer* platformCALayer = nil;
BEGIN_BLOCK_OBJC_EXCEPTIONS
platformCALayer = static_cast<PlatformCALayer*>([[static_cast<CALayer*>(platformLayer) valueForKey:platformCALayerPointer] pointerValue]);
END_BLOCK_OBJC_EXCEPTIONS
--
WebKit Debian packaging