summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/LayerAndroid.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-25 12:23:52 +0000
committerBen Murdoch <benm@google.com>2011-01-25 12:23:52 +0000
commit9c347898f2ee8ba01ae8da83805ff080bcef34d1 (patch)
tree4fd13633e147faee863bf8e5cd9127cae5133de4 /WebCore/platform/graphics/android/LayerAndroid.cpp
parent3adf18ff68c18ee48f402c702f321c93eca82915 (diff)
downloadexternal_webkit-9c347898f2ee8ba01ae8da83805ff080bcef34d1.zip
external_webkit-9c347898f2ee8ba01ae8da83805ff080bcef34d1.tar.gz
external_webkit-9c347898f2ee8ba01ae8da83805ff080bcef34d1.tar.bz2
Fix crash in LayerAndroid::addAnimation
Transfer PassRefPtr to RefPtr. Credit to Jason Simmons for the fix. Bug:3385803 Change-Id: Id148923e95d5628a625c87fe093b85dd381e781e
Diffstat (limited to 'WebCore/platform/graphics/android/LayerAndroid.cpp')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 2fd3790..6426716 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -225,8 +225,9 @@ bool LayerAndroid::evaluateAnimations(double time) const
return hasRunningAnimations;
}
-void LayerAndroid::addAnimation(PassRefPtr<AndroidAnimation> anim)
+void LayerAndroid::addAnimation(PassRefPtr<AndroidAnimation> prpAnim)
{
+ RefPtr<AndroidAnimation> anim = prpAnim;
if (m_animations.get(anim->name()))
removeAnimation(anim->name());
m_animations.add(anim->name(), anim);