Merge "Turn off picture splitting for now." into honeycomb

2011-01-26 05:48:53 -08:00
parent 71353f3671 85b69e0390
commit c45ec3440b
1 changed files with 3 additions and 1 deletions
--- 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);