summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2011-03-16 21:50:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-16 21:50:52 -0700
commit247820c0a756413986643a0ed9a8d446afc747ee (patch)
tree8c7f0ff31f1ed5d9d3bdfa0e04445569fa018520 /core/java/android/webkit/WebView.java
parent8f6c5226c5a0522cf2bbad987004e362098d9464 (diff)
parent8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed (diff)
downloadframeworks_base-247820c0a756413986643a0ed9a8d446afc747ee.zip
frameworks_base-247820c0a756413986643a0ed9a8d446afc747ee.tar.gz
frameworks_base-247820c0a756413986643a0ed9a8d446afc747ee.tar.bz2
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed': partial inval
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-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 3fb878c..ce166bc 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4134,8 +4134,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