Android WebView Merged-Thread Hardware Draw

android_webview/native/aw_contents.h

Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 751368c155f01c8edb104807e20dfae57abe6585..6508bf367dd37798c61b996bc254cb40b3b597bc 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -38,6 +38,7 @@ class AwWebContentsDelegate;
 // level of indirection provided by the AwContentsContainer abstraction.
 class AwContents : public FindHelper::Listener,
                    public IconHelper::Listener,
+                   public AwRenderViewHostExtClient,
                    public BrowserViewRenderer::Client {
  public:
   // Returns the AwContents instance associated with |web_contents|, or NULL.
@@ -132,11 +133,13 @@ class AwContents : public FindHelper::Listener,
   virtual void OnReceivedTouchIconUrl(const std::string& url,
                                       const bool precomposed) OVERRIDE;
 
+  // AwRenderViewHostExtClient implementation.
+  virtual void OnPageScaleFactorChanged(float page_scale_factor) OVERRIDE;
+
   // BrowserViewRenderer::Client implementation.
   virtual void Invalidate() OVERRIDE;
   virtual void OnNewPicture() OVERRIDE;
   virtual gfx::Point GetLocationOnScreen() OVERRIDE;
-  virtual void OnPageScaleFactorChanged(float page_scale_factor) OVERRIDE;
 
   void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);