Merge change 23760 into eclair (b00fc735) · Commits · e / os / android_frameworks_base

core/java/android/webkit/CallbackProxy.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -176,17 +176,6 @@ class CallbackProxy extends Handler {
	return mBackForwardList;		return mBackForwardList;
	}		}

	/**
	* Tell the host application that the WebView has changed viewing modes.
	* @param newViewingMode One of the values described in WebView as possible
	* values for the viewing mode
	*/
	/* package */ void uiOnChangeViewingMode(int newViewingMode) {
	if (mWebChromeClient != null) {
	mWebChromeClient.onChangeViewingMode(mWebView, newViewingMode);
	}
	}

	/**		/**
	* Called by the UI side. Calling overrideUrlLoading from the WebCore		* Called by the UI side. Calling overrideUrlLoading from the WebCore
	* side will post a message to call this method.		* side will post a message to call this method.

core/java/android/webkit/ViewManager.java

+21 −9

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,8 @@ class ViewManager {
	}		}
	setBounds(x, y, width, height);		setBounds(x, y, width, height);
	final AbsoluteLayout.LayoutParams lp =		final AbsoluteLayout.LayoutParams lp =
	new AbsoluteLayout.LayoutParams(ctv(width), ctv(height),		new AbsoluteLayout.LayoutParams(ctvX(width), ctvX(height),
	ctv(x), ctv(y));		ctvX(x), ctvY(y));
	mWebView.mPrivateHandler.post(new Runnable() {		mWebView.mPrivateHandler.post(new Runnable() {
	public void run() {		public void run() {
	// This method may be called multiple times. If the view is		// This method may be called multiple times. If the view is
	@@ -97,9 +97,21 @@ class ViewManager {
	return new ChildView();		return new ChildView();
	}		}

	// contentToView shorthand.		/**
	private int ctv(int val) {		* Shorthand for calling mWebView.contentToViewX. Used when obtaining a
	return mWebView.contentToView(val);		* view x coordinate from a content x coordinate, or when getting a
			* view dimension from a content dimension, whether it be in x or y.
			*/
			private int ctvX(int val) {
			return mWebView.contentToViewX(val);
			}

			/**
			* Shorthand for calling mWebView.contentToViewY. Used when obtaining a
			* view y coordinate from a content y coordinate.
			*/
			private int ctvY(int val) {
			return mWebView.contentToViewY(val);
	}		}

	void scaleAll() {		void scaleAll() {
	@@ -107,10 +119,10 @@ class ViewManager {
	View view = v.mView;		View view = v.mView;
	AbsoluteLayout.LayoutParams lp =		AbsoluteLayout.LayoutParams lp =
	(AbsoluteLayout.LayoutParams) view.getLayoutParams();		(AbsoluteLayout.LayoutParams) view.getLayoutParams();
	lp.width = ctv(v.width);		lp.width = ctvX(v.width);
	lp.height = ctv(v.height);		lp.height = ctvX(v.height);
	lp.x = ctv(v.x);		lp.x = ctvX(v.x);
	lp.y = ctv(v.y);		lp.y = ctvY(v.y);
	view.setLayoutParams(lp);		view.setLayoutParams(lp);
	}		}
	}		}

core/java/android/webkit/WebChromeClient.java

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -22,15 +22,6 @@ import android.view.View;

	public class WebChromeClient {		public class WebChromeClient {

	/**
	* Tell the host application that the WebView has changed viewing modes.
	* @param view The WebView that initiated the callback.
	* @param newViewingMode One of the values described in WebView as possible
	* values for the viewing mode
	* @hide
	*/
	public void onChangeViewingMode(WebView view, int newViewingMode) {}

	/**		/**
	* Tell the host application the current progress of loading a page.		* Tell the host application the current progress of loading a page.
	* @param view The WebView that initiated the callback.		* @param view The WebView that initiated the callback.

core/java/android/webkit/WebView.java

+154 −162

File changed.

Preview size limit exceeded, changes collapsed.