summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2011-03-16 21:54:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-16 21:54:38 -0700
commit16c4f35692902a203983b6b0e1d50bfe44fca27c (patch)
treeb682107ccdd495f45a433ce40cf512a69e919932
parentb4a5f95b8e44d8029827722225ef7f93023ab1b3 (diff)
parent2983bb6a363010403668d39fdc42f5712bff5eb3 (diff)
downloadframeworks_base-16c4f35692902a203983b6b0e1d50bfe44fca27c.zip
frameworks_base-16c4f35692902a203983b6b0e1d50bfe44fca27c.tar.gz
frameworks_base-16c4f35692902a203983b6b0e1d50bfe44fca27c.tar.bz2
am 2983bb6a: am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
* commit '2983bb6a363010403668d39fdc42f5712bff5eb3': partial inval
-rw-r--r--core/java/android/webkit/WebView.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4bb8c5c..0b7f077 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4121,8 +4121,11 @@ public class WebView extends AbsoluteLayout
if (mNativeClass != 0 && nativeEvaluateLayersAnimations()) {
UIAnimationsRunning = true;
// If we have unfinished (or unstarted) animations,
- // we ask for a repaint.
- invalidate();
+ // we ask for a repaint. We only need to do this in software
+ // rendering (with hardware rendering we already have a different
+ // method of requesting a repaint)
+ if (!canvas.isHardwareAccelerated())
+ invalidate();
}
// decide which adornments to draw