diff options
| author | Chris Craik <ccraik@google.com> | 2012-10-23 11:44:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 11:44:22 -0700 |
| commit | cbc18c589df65272fabd2652b1b3f4d1af519579 (patch) | |
| tree | 4e3c6cd9076014aba54bd970fbc8217e4ffd033a /Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | |
| parent | a464817e995321cae99f09266e27d4fa322d9b31 (diff) | |
| parent | 21251e4e2304e2d8ed5040c4d42245eeea5f0143 (diff) | |
| download | external_webkit-cbc18c589df65272fabd2652b1b3f4d1af519579.zip external_webkit-cbc18c589df65272fabd2652b1b3f4d1af519579.tar.gz external_webkit-cbc18c589df65272fabd2652b1b3f4d1af519579.tar.bz2 | |
Merge "Ensure AndroidAnimation's copy of its name string is unique" into jb-mr1-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp index 4dbb9ba..1064388 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp @@ -299,7 +299,7 @@ void LayerAndroid::addDirtyArea() void LayerAndroid::addAnimation(PassRefPtr<AndroidAnimation> prpAnim) { RefPtr<AndroidAnimation> anim = prpAnim; - pair<String, int> key(anim->name(), anim->type()); + pair<String, int> key(anim->nameCopy(), anim->type()); removeAnimationsForProperty(anim->type()); m_animations.add(key, anim); } @@ -322,7 +322,7 @@ void LayerAndroid::removeAnimationsForKeyframes(const String& name) KeyframesMap::const_iterator end = m_animations.end(); Vector<pair<String, int> > toDelete; for (KeyframesMap::const_iterator it = m_animations.begin(); it != end; ++it) { - if ((it->second)->name() == name) + if ((it->second)->isNamed(name)) toDelete.append(it->first); } |