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/WebKit/android/nav/WebView.cpp | |
| 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/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 5387406..870d0d6 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1462,8 +1462,11 @@ void setBaseLayer(BaseLayerAndroid* layer, SkRegion& inval, bool showVisualIndic #if ENABLE(ANDROID_OVERFLOW_SCROLL) if (layer) { + // TODO: the below tree copies are only necessary in software rendering LayerAndroid* newCompositeRoot = static_cast<LayerAndroid*>(layer->getChild(0)); copyScrollPositionRecursive(compositeRoot(), newCompositeRoot); + if (newCompositeRoot) + newCompositeRoot->copyAnimationStartTimesRecursive(compositeRoot()); } #endif SkSafeUnref(m_baseLayer); |