diff options
author | Chris Craik <ccraik@google.com> | 2011-12-02 17:57:26 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 17:57:26 -0800 |
commit | 40388ae439e30064577df47820592af460d03238 (patch) | |
tree | 60b8ae05e169efb94e75f236077b65ba931c07b9 /Source/WebCore | |
parent | a4ddff2196986730910345b2fb01caf261aa32d6 (diff) | |
parent | f4bc9879b9e1ae40df3ef8165b7d6804184b8499 (diff) | |
download | external_webkit-40388ae439e30064577df47820592af460d03238.zip external_webkit-40388ae439e30064577df47820592af460d03238.tar.gz external_webkit-40388ae439e30064577df47820592af460d03238.tar.bz2 |
am f4bc9879: Merge "Maintain UI-side start times for animations in SW rendering mode" into ics-mr1
* commit 'f4bc9879b9e1ae40df3ef8165b7d6804184b8499':
Maintain UI-side start times for animations in SW rendering mode
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); |