diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-06 14:29:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-06 14:29:46 -0800 |
| commit | 1d71a5f4405639dece648eda291ab6a2aecbb968 (patch) | |
| tree | 4d0cfbdc54ff01dc4cf5ae759d56f7ffea0ef766 /Source/WebKit/android/nav/WebView.cpp | |
| parent | c34cfbd2a0063c85afcf6751478987b8c6b6f7e1 (diff) | |
| parent | c6151a04881a67d08d91237891fbc7cb82927219 (diff) | |
| download | external_webkit-1d71a5f4405639dece648eda291ab6a2aecbb968.zip external_webkit-1d71a5f4405639dece648eda291ab6a2aecbb968.tar.gz external_webkit-1d71a5f4405639dece648eda291ab6a2aecbb968.tar.bz2 | |
Merge "Don't deep copy animations, prepare animations on both trees" into ics-mr1
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 fa25c46..d3b9591 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1468,8 +1468,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); @@ -1915,10 +1913,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; } |