2 files changed, 6 insertions, 23 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 58a89c2..131fd2e 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -474,11 +474,11 @@ void AwContents::Invalidate() {
     Java_AwContents_invalidate(env, obj.obj());
 }
 
-void AwContents::OnNewPicture(const JavaRef<jobject>& picture) {
+void AwContents::OnNewPicture() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null())
-    Java_AwContents_onNewPicture(env, obj.obj(), picture.obj());
+    Java_AwContents_onNewPicture(env, obj.obj());
 }
 
 base::android::ScopedJavaLocalRef<jbyteArray>
@@ -653,17 +653,8 @@ ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
-                                    jboolean enabled,
-                                    jboolean invalidation_only) {
-  BrowserViewRenderer::OnNewPictureMode mode =
-      BrowserViewRenderer::kOnNewPictureDisabled;
-  if (enabled) {
-    mode = invalidation_only ?
-        BrowserViewRenderer::kOnNewPictureInvalidationOnly :
-        BrowserViewRenderer::kOnNewPictureEnabled;
-  }
-
-  browser_view_renderer_->EnableOnNewPicture(mode);
+                                    jboolean enabled) {
+  browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 5466c6f..751368c 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -40,12 +40,6 @@ class AwContents : public FindHelper::Listener,
                    public IconHelper::Listener,
                    public BrowserViewRenderer::Client {
  public:
-  enum OnNewPictureMode {
-    kOnNewPictureDisabled = 0,
-    kOnNewPictureEnabled,
-    kOnNewPictureInvalidationOnly,
-  };
-
   // Returns the AwContents instance associated with |web_contents|, or NULL.
   static AwContents* FromWebContents(content::WebContents* web_contents);
 
@@ -113,8 +107,7 @@ class AwContents : public FindHelper::Listener,
                                                             jobject obj);
   void EnableOnNewPicture(JNIEnv* env,
                           jobject obj,
-                          jboolean enabled,
-                          jboolean invalidation_only);
+                          jboolean enabled);
 
   // Geolocation API support
   void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
@@ -141,8 +134,7 @@ class AwContents : public FindHelper::Listener,
 
   // BrowserViewRenderer::Client implementation.
   virtual void Invalidate() OVERRIDE;
-  virtual void OnNewPicture(
-      const base::android::JavaRef<jobject>& picture) OVERRIDE;
+  virtual void OnNewPicture() OVERRIDE;
   virtual gfx::Point GetLocationOnScreen() OVERRIDE;
   virtual void OnPageScaleFactorChanged(float page_scale_factor) OVERRIDE;