Update zoom (aka display) density from WebView thread. (31f263db) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -738,6 +738,7 @@ public class WebView extends AbsoluteLayout
	static final int SCREEN_ON = 136;		static final int SCREEN_ON = 136;
	static final int ENTER_FULLSCREEN_VIDEO = 137;		static final int ENTER_FULLSCREEN_VIDEO = 137;
	static final int UPDATE_SELECTION = 138;		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 FIRST_PACKAGE_MSG_ID = SCROLL_TO_MSG_ID;
	private static final int LAST_PACKAGE_MSG_ID = SET_TOUCH_HIGHLIGHT_RECTS;		private static final int LAST_PACKAGE_MSG_ID = SET_TOUCH_HIGHLIGHT_RECTS;
	@@ -793,7 +794,9 @@ public class WebView extends AbsoluteLayout
	"AUTOFILL_COMPLETE", // = 134;		"AUTOFILL_COMPLETE", // = 134;
	"SELECT_AT", // = 135;		"SELECT_AT", // = 135;
	"SCREEN_ON", // = 136;		"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,		// If the site doesn't use the viewport meta tag to specify the viewport,
	@@ -8431,6 +8434,11 @@ public class WebView extends AbsoluteLayout
	mZoomManager.updateZoomRange(viewState, getViewWidth(), viewState.mScrollX);		mZoomManager.updateZoomRange(viewState, getViewWidth(), viewState.mScrollX);
	break;		break;
	}		}
			case UPDATE_ZOOM_DENSITY: {
			final float density = (Float) msg.obj;
			mZoomManager.updateDefaultZoomDensity(density);
			break;
			}
	case REPLACE_BASE_CONTENT: {		case REPLACE_BASE_CONTENT: {
	nativeReplaceBaseContent(msg.arg1);		nativeReplaceBaseContent(msg.arg1);
	break;		break;

core/java/android/webkit/WebViewCore.java

+2 −1

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