summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-06-29 17:02:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-29 17:02:09 -0700
commit010cd51501025e3208383f6514f977fa103f4c7d (patch)
tree9195cebf0473cb34ed6b163c1ed8981ea21b9998 /Source/WebCore
parent95aac6ac538d94a3a806c66c0e40696fa545b5d0 (diff)
parent4ca85c70a5d00d0903cafdcbf0d56188a06dcb38 (diff)
downloadexternal_webkit-010cd51501025e3208383f6514f977fa103f4c7d.zip
external_webkit-010cd51501025e3208383f6514f977fa103f4c7d.tar.gz
external_webkit-010cd51501025e3208383f6514f977fa103f4c7d.tar.bz2
Merge "Added fix for AndroidAnimation copy (m_name was forgotten)"
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/AndroidAnimation.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
index 1eb7f39..e7d4780 100644
--- a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
+++ b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
@@ -86,6 +86,7 @@ AndroidAnimation::AndroidAnimation(AndroidAnimation* anim)
, m_type(anim->m_type)
, m_operations(anim->m_operations)
, m_originalLayer(0)
+ , m_name(anim->name())
{
gDebugAndroidAnimationInstances++;
}