diff options
author | Chris Craik <ccraik@google.com> | 2011-12-02 14:03:25 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-02 14:03:25 -0800 |
commit | f4bc9879b9e1ae40df3ef8165b7d6804184b8499 (patch) | |
tree | 109a3994fb2c7447465b09e8460da21f79f36860 /Source/WebCore | |
parent | d428cef6d334156cb4178476d2c36d115d91d4a4 (diff) | |
parent | 7962416088590b8449c81a02f0a882ad29840cbe (diff) | |
download | external_webkit-f4bc9879b9e1ae40df3ef8165b7d6804184b8499.zip external_webkit-f4bc9879b9e1ae40df3ef8165b7d6804184b8499.tar.gz external_webkit-f4bc9879b9e1ae40df3ef8165b7d6804184b8499.tar.bz2 |
Merge "Maintain UI-side start times for animations in SW rendering mode" into ics-mr1
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.cpp | 14 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/android/LayerAndroid.h | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp index 1cd2b1a..0557847 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -902,6 +902,20 @@ void LayerAndroid::setIsPainting(Layer* drawingTree) obtainTextureForPainting(drawingLayer); } +void LayerAndroid::copyAnimationStartTimesRecursive(LayerAndroid* oldTree) +{ + // used for copying UI-side animation start times in software rendering mode + if (!oldTree) + return; + + for (int i = 0; i < countChildren(); i++) + this->getChild(i)->copyAnimationStartTimesRecursive(oldTree); + + LayerAndroid* layer = oldTree->findById(uniqueId()); + if (layer) + copyAnimationStartTimes(layer); +} + void LayerAndroid::copyAnimationStartTimes(LayerAndroid* oldLayer) { if (!oldLayer) diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.h b/Source/WebCore/platform/graphics/android/LayerAndroid.h index cc96fae..5c13899 100644 --- a/Source/WebCore/platform/graphics/android/LayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/LayerAndroid.h @@ -303,6 +303,8 @@ public: bool hasText() { return m_hasText; } void checkTextPresence(); + void copyAnimationStartTimesRecursive(LayerAndroid* oldTree); + // rendering asset management void swapTiles(); void setIsDrawing(bool isDrawing); |