diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-15 15:28:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 15:28:21 -0700 |
| commit | 6675f691ed952d37232a36a6e6f15e02fb419f9c (patch) | |
| tree | 956c008e043708100cb226d5d8d9e43dbb0d97ba /core/java/android/webkit/ZoomManager.java | |
| parent | c8654acf6363830d9f0aef5dd09c9b97e75f9792 (diff) | |
| parent | 02c2f45ea21fefe2449bfb95c85df746b3a88bdc (diff) | |
| download | frameworks_base-6675f691ed952d37232a36a6e6f15e02fb419f9c.zip frameworks_base-6675f691ed952d37232a36a6e6f15e02fb419f9c.tar.gz frameworks_base-6675f691ed952d37232a36a6e6f15e02fb419f9c.tar.bz2 | |
Merge "Invalidate on new picture if scale/content size changes" into jb-dev
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 2247678..1da59e4 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -1008,8 +1008,10 @@ class ZoomManager { /** * Updates zoom values when Webkit produces a new picture. This method * should only be called from the UI thread's message handler. + * + * @return True if zoom value has changed */ - public void onNewPicture(WebViewCore.DrawData drawData) { + public boolean onNewPicture(WebViewCore.DrawData drawData) { final int viewWidth = mWebView.getViewWidth(); final boolean zoomOverviewWidthChanged = setupZoomOverviewWidth(drawData, viewWidth); final float newZoomOverviewScale = getZoomOverviewScale(); @@ -1056,6 +1058,8 @@ class ZoomManager { // so next new picture could be forced into overview mode if it's true. mInitialZoomOverview = mInZoomOverview; } + + return scaleHasDiff; } /** |