diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 15:50:10 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 15:50:10 -0400 |
| commit | 2dfaa698012b36d83e342b5ef1e88734dfbcac80 (patch) | |
| tree | a4e5cf7ff9200a92e937f8cf1640703b2be4ea28 | |
| parent | 1f668fff8ad2b8d79d42da5d9667d308fa0b9441 (diff) | |
| parent | dafc19a1406bdd554fb4629d79c8aa4d75aca363 (diff) | |
| download | frameworks_base-2dfaa698012b36d83e342b5ef1e88734dfbcac80.zip frameworks_base-2dfaa698012b36d83e342b5ef1e88734dfbcac80.tar.gz frameworks_base-2dfaa698012b36d83e342b5ef1e88734dfbcac80.tar.bz2 | |
Merge change I882d2eb8 into eclair
* changes:
do not merge
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 86685fb..a5a4852 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1643,8 +1643,6 @@ final class WebViewCore { final DrawFilter mZoomFilter = new PaintFlagsDrawFilter(ZOOM_BITS, Paint.LINEAR_TEXT_FLAG); - final DrawFilter mScrollFilter = - new PaintFlagsDrawFilter(SCROLL_BITS, 0); /* package */ void drawContentPicture(Canvas canvas, int color, boolean animatingZoom, @@ -1653,7 +1651,7 @@ final class WebViewCore { if (animatingZoom) { df = mZoomFilter; } else if (animatingScroll) { - df = mScrollFilter; + df = null; } canvas.setDrawFilter(df); boolean tookTooLong = nativeDrawContent(canvas, color); |