diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-02 13:42:02 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-12-02 13:56:44 -0800 |
| commit | 7962416088590b8449c81a02f0a882ad29840cbe (patch) | |
| tree | 9c081486acd394ad72b6aa8313b0b9388220ef3e /Source/WebKit/android/nav/WebView.cpp | |
| parent | 243f1a9f7a19e951afa11a656b273cd4da03ef38 (diff) | |
| download | external_webkit-7962416088590b8449c81a02f0a882ad29840cbe.zip external_webkit-7962416088590b8449c81a02f0a882ad29840cbe.tar.gz external_webkit-7962416088590b8449c81a02f0a882ad29840cbe.tar.bz2 | |
Maintain UI-side start times for animations in SW rendering mode
bug:5704428
Change-Id: I1d1d1f214642b6ff868e8425778565686bfe8b69
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); |