diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-06 16:59:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:59:34 -0800 |
| commit | 68fb8148a0ec1e8218fc0afba22e42c70aca53af (patch) | |
| tree | 57ce7093ea1bac6038d22d40b9595d3732dc1eff /Source/WebKit/android/nav/WebView.cpp | |
| parent | 1243f431c72be22bf319cfe362a1df3c0c0f3159 (diff) | |
| parent | 1d71a5f4405639dece648eda291ab6a2aecbb968 (diff) | |
| download | external_webkit-68fb8148a0ec1e8218fc0afba22e42c70aca53af.zip external_webkit-68fb8148a0ec1e8218fc0afba22e42c70aca53af.tar.gz external_webkit-68fb8148a0ec1e8218fc0afba22e42c70aca53af.tar.bz2 | |
am 1d71a5f4: Merge "Don\'t deep copy animations, prepare animations on both trees" into ics-mr1
* commit '1d71a5f4405639dece648eda291ab6a2aecbb968':
Don't deep copy animations, prepare animations on both trees
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index ad6fc8c..5491b23 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1452,8 +1452,6 @@ void setBaseLayer(BaseLayerAndroid* layer, SkRegion& inval, bool showVisualIndic // 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); @@ -1898,10 +1896,13 @@ static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jobject jrect, static bool nativeEvaluateLayersAnimations(JNIEnv *env, jobject obj, jint nativeView) { + // only call in software rendering, initialize and evaluate animations #if USE(ACCELERATED_COMPOSITING) LayerAndroid* root = ((WebView*)nativeView)->compositeRoot(); - if (root) + if (root) { + root->initAnimations(); return root->evaluateAnimations(); + } #endif return false; } |