Wait for zoom manager to update before sending new picture event.

George Mount · George Mount · commit 8b0d90ee5768 · 2012-04-13T13:16:15.000-07:00
Bug 6315070

Change-Id: I80be7680499705f7865abc8ef753db1bb63ef44f
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -8089,17 +8089,17 @@ void setNewPicture(final WebViewCore.DrawData draw, boolean updateBaseLayer) {
             mWebView.invalidate();
         }
 
-        if (mPictureListener != null) {
-            mPictureListener.onNewPicture(getWebView(), capturePicture());
-        }
-
         // update the zoom information based on the new picture
         mZoomManager.onNewPicture(draw);
 
         if (isPictureAfterFirstLayout) {
             mViewManager.postReadyToDrawAll();
         }
         scrollEditWithCursor();
+
+        if (mPictureListener != null) {
+            mPictureListener.onNewPicture(getWebView(), capturePicture());
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -8089,17 +8089,17 @@ void setNewPicture(final WebViewCore.DrawData draw, boolean updateBaseLayer) {`
`8089`	`8089`	`mWebView.invalidate();`
`8090`	`8090`	`}`
`8091`	`8091`
`8092`		`- if (mPictureListener != null) {`
`8093`		`- mPictureListener.onNewPicture(getWebView(), capturePicture());`
`8094`		`- }`
`8095`		`-`
`8096`	`8092`	`// update the zoom information based on the new picture`
`8097`	`8093`	`mZoomManager.onNewPicture(draw);`
`8098`	`8094`
`8099`	`8095`	`if (isPictureAfterFirstLayout) {`
`8100`	`8096`	`mViewManager.postReadyToDrawAll();`
`8101`	`8097`	`}`
`8102`	`8098`	`scrollEditWithCursor();`
	`8099`	`+`
	`8100`	`+ if (mPictureListener != null) {`
	`8101`	`+ mPictureListener.onNewPicture(getWebView(), capturePicture());`
	`8102`	`+ }`
`8103`	`8103`	`}`
`8104`	`8104`
`8105`	`8105`	`/**`