diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-25 10:55:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 10:55:01 -0800 |
| commit | 68934d8facb223c3f0bc1f44f36554b3c39dc8ea (patch) | |
| tree | 60ca1b3340866bc4771b33bf415e3f4d2d4bc42b | |
| parent | e5271873d9e1e31a104d4253395c333c67e26ab5 (diff) | |
| parent | 9c347898f2ee8ba01ae8da83805ff080bcef34d1 (diff) | |
| download | external_webkit-68934d8facb223c3f0bc1f44f36554b3c39dc8ea.zip external_webkit-68934d8facb223c3f0bc1f44f36554b3c39dc8ea.tar.gz external_webkit-68934d8facb223c3f0bc1f44f36554b3c39dc8ea.tar.bz2 | |
Merge "Fix crash in LayerAndroid::addAnimation" into honeycomb
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 3 |
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); |