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/WebKit/android/nav/WebView.cpp | |
| 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/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 300b58e..fa25c46 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1465,8 +1465,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); |