Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1

Browse Source 
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
This commit is contained in:
Mangesh Ghiware
2011-11-21 23:16:06 -08:00
committed by Android Git Automerger
parent ea54d0dc0d 8d03007f80
commit d7b06977e9
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/WebView.java
View File

@@ -742,6 +742,7 @@ public class WebView extends AbsoluteLayout
static final int SCREEN_ON = 136;
static final int ENTER_FULLSCREEN_VIDEO = 137;
static final int UPDATE_SELECTION = 138;
static final int UPDATE_ZOOM_DENSITY = 139;
private static final int FIRST_PACKAGE_MSG_ID = SCROLL_TO_MSG_ID;
private static final int LAST_PACKAGE_MSG_ID = SET_TOUCH_HIGHLIGHT_RECTS;
@@ -797,7 +798,9 @@ public class WebView extends AbsoluteLayout
"AUTOFILL_COMPLETE", // = 134;
"SELECT_AT", // = 135;
"SCREEN_ON", // = 136;
"ENTER_FULLSCREEN_VIDEO" // = 137;
"ENTER_FULLSCREEN_VIDEO", // = 137;
"UPDATE_SELECTION", // = 138;
"UPDATE_ZOOM_DENSITY" // = 139;
};
// If the site doesn't use the viewport meta tag to specify the viewport,
@@ -8444,6 +8447,11 @@ public class WebView extends AbsoluteLayout
mZoomManager.updateZoomRange(viewState, getViewWidth(), viewState.mScrollX);
break;
}
case UPDATE_ZOOM_DENSITY: {
final float density = (Float) msg.obj;
mZoomManager.updateDefaultZoomDensity(density);
break;
}
case REPLACE_BASE_CONTENT: {
nativeReplaceBaseContent(msg.arg1);
break;

3
core/java/android/webkit/WebViewCore.java
View File

@@ -2337,7 +2337,8 @@ public final class WebViewCore {
/ mViewportDensityDpi;
}
if (adjust != mWebView.getDefaultZoomScale()) {
mWebView.updateDefaultZoomDensity(adjust);
Message.obtain(mWebView.mPrivateHandler,
WebView.UPDATE_ZOOM_DENSITY, adjust).sendToTarget();
}
int defaultScale = (int) (adjust * 100);