summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-01-26 05:48:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 05:48:53 -0800
commitc45ec3440bcdc00542e5e08cfa7ba29593cb7609 (patch)
tree7e9bcccb5102c74ad20f3d8e5148ba4590b23326
parent71353f367185a254238ffa56c1e158a48d3b28cb (diff)
parent85b69e03907b99b4011ea54dc210d74249f546fa (diff)
downloadframeworks_base-c45ec3440bcdc00542e5e08cfa7ba29593cb7609.zip
frameworks_base-c45ec3440bcdc00542e5e08cfa7ba29593cb7609.tar.gz
frameworks_base-c45ec3440bcdc00542e5e08cfa7ba29593cb7609.tar.bz2
Merge "Turn off picture splitting for now." into honeycomb
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ca45e68..cf1ce6b 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4087,7 +4087,9 @@ public class WebView extends AbsoluteLayout
df = mScrollFilter;
}
canvas.setDrawFilter(df);
- int content = nativeDraw(canvas, color, extras, true);
+ // XXX: Revisit splitting content. Right now it causes a
+ // synchronization problem with layers.
+ int content = nativeDraw(canvas, color, extras, false);
canvas.setDrawFilter(null);
if (content != 0) {
mWebViewCore.sendMessage(EventHub.SPLIT_PICTURE_SET, content, 0);