Consolidate the SW and HW draw methods in InProcessViewRenderer

As the view renderer already requests DrawGL invocation for the GL init
path, it's simpler to have it always request GL callback than sometimes
have AwContents.java perform that duty.

Review URL: https://chromiumcodereview.appspot.com/16034017

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

1 files changed, 9 insertions, 8 deletions

diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 0465ae2..170e9b7 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -94,15 +94,16 @@ class AwContents : public FindHelper::Listener,
       JNIEnv* env, jobject obj);
   jboolean RestoreFromOpaqueState(JNIEnv* env, jobject obj, jbyteArray state);
   void FocusFirstNode(JNIEnv* env, jobject obj);
-  bool DrawSW(JNIEnv* env,
+  bool OnDraw(JNIEnv* env,
               jobject obj,
               jobject canvas,
-              jint clip_x,
-              jint clip_y,
-              jint clip_w,
-              jint clip_h);
-  bool PrepareDrawGL(JNIEnv* env, jobject obj,
-                     int scroll_x, int scroll_y);
+              jboolean is_hardware_accelerated,
+              jint scroll_x,
+              jint scroll_y,
+              jint clip_left,
+              jint clip_top,
+              jint clip_right,
+              jint clip_bottom);
   jint GetAwDrawGLViewContext(JNIEnv* env, jobject obj);
   base::android::ScopedJavaLocalRef<jobject> CapturePicture(JNIEnv* env,
                                                             jobject obj);
@@ -137,7 +138,7 @@ class AwContents : public FindHelper::Listener,
   virtual void OnPageScaleFactorChanged(float page_scale_factor) OVERRIDE;
 
   // BrowserViewRenderer::Client implementation.
-  virtual void RequestProcessMode() OVERRIDE;
+  virtual bool RequestDrawGL(jobject canvas) OVERRIDE;
   virtual void Invalidate() OVERRIDE;
   virtual void OnNewPicture() OVERRIDE;
   virtual gfx::Point GetLocationOnScreen() OVERRIDE;