Merge "Manual merge pinch zoom from Eclair to Master." (733687d4) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -412,6 +412,7 @@ public class WebSettings {
		*/
		public void setSupportZoom(boolean support) {
		mSupportZoom = support;
		mWebView.updateMultiTouchSupport(mContext);
		}

		/**
		@@ -426,6 +427,7 @@ public class WebSettings {
		*/
		public void setBuiltInZoomControls(boolean enabled) {
		mBuiltInZoomControls = enabled;
		mWebView.updateMultiTouchSupport(mContext);
		}

		/**

core/java/android/webkit/WebView.java

+369 −142

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/WebViewCore.java

+46 −9

Original line number	Diff line number	Diff line
		@@ -482,8 +482,8 @@ final class WebViewCore {
		should this be called nativeSetViewPortSize?
		*/
		private native void nativeSetSize(int width, int height, int screenWidth,
		float scale, int realScreenWidth, int screenHeight,
		boolean ignoreHeight);
		float scale, int realScreenWidth, int screenHeight, int anchorX,
		int anchorY, boolean ignoreHeight);

		private native int nativeGetContentMinPrefWidth();

		@@ -1033,6 +1033,7 @@ final class WebViewCore {
		(WebView.ViewSizeData) msg.obj;
		viewSizeChanged(data.mWidth, data.mHeight,
		data.mTextWrapWidth, data.mScale,
		data.mAnchorX, data.mAnchorY,
		data.mIgnoreHeight);
		break;
		}
		@@ -1584,7 +1585,7 @@ final class WebViewCore {

		// notify webkit that our virtual view size changed size (after inv-zoom)
		private void viewSizeChanged(int w, int h, int textwrapWidth, float scale,
		boolean ignoreHeight) {
		int anchorX, int anchorY, boolean ignoreHeight) {
		if (DebugFlags.WEB_VIEW_CORE) {
		Log.v(LOGTAG, "viewSizeChanged w=" + w + "; h=" + h
		+ "; textwrapWidth=" + textwrapWidth + "; scale=" + scale);
		@@ -1616,12 +1617,14 @@ final class WebViewCore {
		Math.max(WebView.DEFAULT_VIEWPORT_WIDTH,
		nativeGetContentMinPrefWidth())));
		}
		} else {
		} else if (mViewportWidth > 0) {
		width = Math.max(w, mViewportWidth);
		} else {
		width = textwrapWidth;
		}
		}
		nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),
		textwrapWidth, scale, w, h, ignoreHeight);
		textwrapWidth, scale, w, h, anchorX, anchorY, ignoreHeight);
		// Remember the current width and height
		boolean needInvalidate = (mCurrentViewWidth == 0);
		mCurrentViewWidth = w;
		@@ -2070,14 +2073,12 @@ final class WebViewCore {
		mRestoreState.mScrollY = mRestoredY;
		mRestoreState.mMobileSite = (0 == mViewportWidth);
		if (mRestoredScale > 0) {
		mRestoreState.mViewScale = mRestoredScale / 100.0f;
		if (mRestoredScreenWidthScale > 0) {
		mRestoreState.mTextWrapScale =
		mRestoredScreenWidthScale / 100.0f;
		// 0 will trigger WebView to turn on zoom overview mode
		mRestoreState.mViewScale = 0;
		} else {
		mRestoreState.mViewScale = mRestoreState.mTextWrapScale =
		mRestoredScale / 100.0f;
		mRestoreState.mTextWrapScale = mRestoreState.mViewScale;
		}
		} else {
		if (mViewportInitialScale > 0) {
		@@ -2110,6 +2111,7 @@ final class WebViewCore {
		data.mTextWrapWidth = data.mWidth;
		data.mScale = -1.0f;
		data.mIgnoreHeight = false;
		data.mAnchorX = data.mAnchorY = 0;
		// send VIEW_SIZE_CHANGED to the front of the queue so that we can
		// avoid pushing the wrong picture to the WebView side. If there is
		// a VIEW_SIZE_CHANGED in the queue, probably from WebView side,
		@@ -2145,6 +2147,7 @@ final class WebViewCore {
		data.mTextWrapWidth = Math.round(webViewWidth
		/ mRestoreState.mTextWrapScale);
		data.mIgnoreHeight = false;
		data.mAnchorX = data.mAnchorY = 0;
		// send VIEW_SIZE_CHANGED to the front of the queue so that we
		// can avoid pushing the wrong picture to the WebView side.
		mEventHub.removeMessages(EventHub.VIEW_SIZE_CHANGED);
		@@ -2364,6 +2367,40 @@ final class WebViewCore {
		childView.removeView();
		}

		// called by JNI
		static class ShowRectData {
		int mLeft;
		int mTop;
		int mWidth;
		int mHeight;
		int mContentWidth;
		int mContentHeight;
		float mXPercentInDoc;
		float mXPercentInView;
		float mYPercentInDoc;
		float mYPercentInView;
		}

		private void showRect(int left, int top, int width, int height,
		int contentWidth, int contentHeight, float xPercentInDoc,
		float xPercentInView, float yPercentInDoc, float yPercentInView) {
		if (mWebView != null) {
		ShowRectData data = new ShowRectData();
		data.mLeft = left;
		data.mTop = top;
		data.mWidth = width;
		data.mHeight = height;
		data.mContentWidth = contentWidth;
		data.mContentHeight = contentHeight;
		data.mXPercentInDoc = xPercentInDoc;
		data.mXPercentInView = xPercentInView;
		data.mYPercentInDoc = yPercentInDoc;
		data.mYPercentInView = yPercentInView;
		Message.obtain(mWebView.mPrivateHandler, WebView.SHOW_RECT_MSG_ID,
		data).sendToTarget();
		}
		}

		private native void nativePause();
		private native void nativeResume();
		private native void nativeFreeMemory();