am b8495145: Merge "Update WebView.PictureListener.onNewPicture to pass null picture." (5875cc6b) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -334,7 +334,8 @@ public class WebView extends AbsoluteLayout
		* See {@link WebView#capturePicture} for details of the picture.
		*
		* @param view the WebView that owns the picture
		* @param picture the new picture
		* @param picture the new picture. Applications targetting Jelly
		* Bean MR2 or above will always receive a null Picture.
		* @deprecated Deprecated due to internal changes.
		*/
		@Deprecated

+10 −2

Original line number	Diff line number	Diff line
		@@ -7909,7 +7909,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		if (mPictureListener != null) {
		// trigger picture listener for hardware layers. Software layers are
		// triggered in setNewPicture
		mPictureListener.onNewPicture(getWebView(), capturePicture());
		// TODO: Update CUR_DEVELOPMENT when appropriate JBMR2 constant is
		// available.
		Picture picture = mContext.getApplicationInfo().targetSdkVersion <
		Build.VERSION_CODES.CUR_DEVELOPMENT ? capturePicture() : null;
		mPictureListener.onNewPicture(getWebView(), picture);
		}
		}

		@@ -7994,7 +7998,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		\|\| mWebView.getLayerType() == View.LAYER_TYPE_SOFTWARE) {
		// trigger picture listener for software layers. Hardware layers are
		// triggered in pageSwapCallback
		mPictureListener.onNewPicture(getWebView(), capturePicture());
		// TODO: Update CUR_DEVELOPMENT when appropriate JBMR2 constant is
		// available.
		Picture picture = mContext.getApplicationInfo().targetSdkVersion <
		Build.VERSION_CODES.CUR_DEVELOPMENT ? capturePicture() : null;
		mPictureListener.onNewPicture(getWebView(), picture);
		}
		}
		}