Fix for bug 235641, remove kOnNewPictureEnabled

This mode is now obsolete.

Android webview only patch that get stuck on different trybots each time.
Adding notry:
NOTRY=true

BUG=235641
R=joth@chromium.org

Review URL: https://codereview.chromium.org/14668007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198904 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 17bfdb5..3f4125c 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -129,6 +129,8 @@ public class AwContents {
 
     private DefaultVideoPosterRequestHandler mDefaultVideoPosterRequestHandler;
 
+    private boolean mNewPictureInvalidationOnly;
+
     private static final class DestroyRunnable implements Runnable {
         private int mNativeAwContents;
         private DestroyRunnable(int nativeAwContents) {
@@ -451,7 +453,8 @@ public class AwContents {
      * @param invalidationOnly Flag to call back only on invalidation without providing a picture.
      */
     public void enableOnNewPicture(boolean enabled, boolean invalidationOnly) {
-        nativeEnableOnNewPicture(mNativeAwContents, enabled, invalidationOnly);
+        mNewPictureInvalidationOnly = invalidationOnly;
+        nativeEnableOnNewPicture(mNativeAwContents, enabled);
     }
 
     // This is no longer synchronous and just calls the Async version and return 0.
@@ -1269,8 +1272,8 @@ public class AwContents {
     }
 
     @CalledByNative
-    public void onNewPicture(Picture picture) {
-        mContentsClient.onNewPicture(picture);
+    public void onNewPicture() {
+        mContentsClient.onNewPicture(mNewPictureInvalidationOnly ? null : capturePicture());
     }
 
     // Called as a result of nativeUpdateLastHitTestData.
@@ -1415,8 +1418,7 @@ public class AwContents {
             int clipW, int clipH);
     private native int nativeGetAwDrawGLViewContext(int nativeAwContents);
     private native Picture nativeCapturePicture(int nativeAwContents);
-    private native void nativeEnableOnNewPicture(int nativeAwContents, boolean enabled,
-            boolean invalidationOnly);
+    private native void nativeEnableOnNewPicture(int nativeAwContents, boolean enabled);
 
     private native void nativeInvokeGeolocationCallback(
             int nativeAwContents, boolean value, String requestingFrame);