[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 46161d0897a137d4987d7c57c39bd6c53d3b2875
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 00:26:21 2010 +0000

    Fix the last clang++ build error.
    
    * platform/graphics/ca/mac/PlatformCALayerMac.mm:
    (PlatformCALayer::animationForKey):
    Cast the returned animation to the correct type.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 53695b9..61c7701 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-07  Anders Carlsson  <andersca at apple.com>
 
+        Fix the last clang++ build error.
+
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayer::animationForKey):
+        Cast the returned animation to the correct type.
+
+2010-12-07  Anders Carlsson  <andersca at apple.com>
+
         Fix some clang++ build errors.
 
         * platform/graphics/ca/GraphicsLayerCA.cpp:
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index d06e487..bb30b5f 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -380,10 +380,10 @@ void PlatformCALayer::removeAnimationForKey(const String& key)
 
 PassRefPtr<PlatformCAAnimation> PlatformCALayer::animationForKey(const String& key)
 {
-    CAAnimation* anim = [m_layer.get() animationForKey:key];
-    if (!anim)
+    CAPropertyAnimation* propertyAnimation = static_cast<CAPropertyAnimation*>([m_layer.get() animationForKey:key]);
+    if (!propertyAnimation)
         return 0;
-    return PlatformCAAnimation::create(anim);
+    return PlatformCAAnimation::create(propertyAnimation);
 }
 
 PlatformCALayer* PlatformCALayer::mask() const

-- 
WebKit Debian packaging