[Android WebView] Migrate the rendering code to a separate set of classes.

android_webview/browser/browser_view_renderer.h

Index: android_webview/browser/browser_view_renderer.h
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
new file mode 100644
index 0000000000000000000000000000000000000000..60fc782ae79ad8dc22dff20164cb7645db6fcd4a
--- /dev/null
+++ b/android_webview/browser/browser_view_renderer.h
@@ -0,0 +1,116 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
+#define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
+
+#include "base/android/scoped_java_ref.h"
+#include "skia/ext/refptr.h"
+
+struct AwDrawGLInfo;
+struct AwDrawSWFunctionTable;
+class SkPicture;
+
+namespace content {
+class ContentViewCore;
+}
+
+namespace gfx {
+class Rect;
+}
+
+namespace android_webview {
+
+// Interface for all the WebView-specific content rendering operations.
+// Provides software and hardware rendering and the Capture Picture API.
+class BrowserViewRenderer {
+ public:
+  class Client {
+   public:
+     // Called to trigger view invalidations.
+     virtual void Invalidate() = 0;
+
+     // Called when a new Picture is available. Needs to be enabled
+     // via the EnableOnNewPicture method.
+     virtual void OnNewPicture(
+         const base::android::JavaRef<jobject>& picture) = 0;
+
+   protected:
+     virtual ~Client() {}
+  };
+
+  // Delegate to perform rendering actions involving Java objects.
+  class JavaHelper {
+   public:
+    // Creates a RGBA_8888 Java Bitmap object of the requested size.
+    virtual base::android::ScopedJavaLocalRef<jobject> CreateBitmap(
+        JNIEnv* env,
+        int width,
+        int height) = 0;
+
+    // Draws the provided Java Bitmap into the provided Java Canvas.
+    virtual void DrawBitmapIntoCanvas(
+        JNIEnv* env,
+        const base::android::JavaRef<jobject>& jbitmap,
+        const base::android::JavaRef<jobject>& jcanvas) = 0;
+
+    // Creates a Java Picture object that records drawing the provided Bitmap.
+    virtual base::android::ScopedJavaLocalRef<jobject> RecordBitmapIntoPicture(
+        JNIEnv* env,
+        const base::android::JavaRef<jobject>& jbitmap) = 0;
+
+   protected:
+    virtual ~JavaHelper() {}
+  };
+
+  enum OnNewPictureMode {
+    kOnNewPictureDisabled = 0,
+    kOnNewPictureEnabled,
+    kOnNewPictureInvalidationOnly,
+  };
+
+  virtual ~BrowserViewRenderer();
+
+  // Content control methods.
+  virtual void SetContents(content::ContentViewCore* content_view_core) = 0;
+
+  // Hardware rendering methods.
+  virtual void DrawGL(AwDrawGLInfo* draw_info) = 0;
+  virtual void SetScrollForHWFrame(int x, int y) = 0;
+
+  // Software rendering methods.
+  virtual bool DrawSW(jobject java_canvas, const gfx::Rect& clip_bounds) = 0;
+
+  // CapturePicture API methods.
+  virtual base::android::ScopedJavaLocalRef<jobject> CapturePicture() = 0;
+  virtual void EnableOnNewPicture(OnNewPictureMode mode) = 0;
+
+  // View update notifications.
+  virtual void OnVisibilityChanged(bool view_visible, bool window_visible) = 0;
+  virtual void OnSizeChanged(int width, int height) = 0;
+  virtual void OnAttachedToWindow(int width, int height) = 0;
+  virtual void OnDetachedFromWindow() = 0;
+
+  // Platform methods.
+  static void SetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table);
+
+ protected:
+  BrowserViewRenderer(Client* client, JavaHelper* java_helper);
+
+  Client* client() const { return client_; }
+  JavaHelper* java_helper() const { return java_helper_; }
+
+  static AwDrawSWFunctionTable* SWDrawFunctions();
+  static bool IsSkiaVersionCompatible();
+
+ private:
+  Client* client_;
+  JavaHelper* java_helper_;

[joth, 2013/02/06 20:26:31]

I think if we're going to make this a real interface (all pure-virtual) we
should remove the data members from here too.

(I'm fine with either no interface or pure interface as you see best)

[Leandro Graciá Gil, 2013/02/07 12:43:56]

Made a pure interface. Moving data members and SetAwDrawSWFunctionTable to the
implementation class.

+
+  DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
+};
+
+}  // namespace android_webview
+
+#endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_