Android WebView Merged-Thread Hardware Draw

android_webview/browser/renderer_host/aw_render_view_host_ext.h

Index: android_webview/browser/renderer_host/aw_render_view_host_ext.h
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.h b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
index df7d1fe521bd5795f3e52657262a6530c0ac0c18..dbda9ab310a6202dad8d7f69fef66390a885e4b0 100644
--- a/android_webview/browser/renderer_host/aw_render_view_host_ext.h
+++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
@@ -25,9 +25,18 @@ namespace android_webview {
 class AwRenderViewHostExt : public content::WebContentsObserver,
                             public base::NonThreadSafe {
  public:
+  class Client {

[joth, 2013/05/09 13:14:39]

common preference is to not use nested classes. So, this should be
AwRenderViewHostExtClient. (OK to put in same file I think)

+   public:
+    // Called when the RenderView page scale changes.
+    virtual void OnPageScaleFactorChanged(float page_scale_factor) = 0;
+
+   protected:
+    virtual ~Client() {}
+  };
+
   // To send receive messages to a RenderView we take the WebContents instance,
   // as it internally handles RenderViewHost instances changing underneath us.
-  AwRenderViewHostExt(content::WebContents* contents);
+  AwRenderViewHostExt(Client* client, content::WebContents* contents);
   virtual ~AwRenderViewHostExt();
 
   // |result| will be invoked with the outcome of the request.
@@ -70,10 +79,13 @@ class AwRenderViewHostExt : public content::WebContentsObserver,
 
   void OnDocumentHasImagesResponse(int msg_id, bool has_images);
   void OnUpdateHitTestData(const AwHitTestData& hit_test_data);
-  void OnPictureUpdated();
+  void OnDidActivateAcceleratedCompositing(int input_handler_id);
+  void OnPageScaleFactorChanged(float page_scale_factor);
 
   bool IsRenderViewReady() const;
 
+  Client* client_;
+
   std::map<int, DocumentHasImagesResult> pending_document_has_images_requests_;
 
   // Master copy of hit test data on the browser side. This is updated