Part 2: WIP Refactor Webview graphics related code

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 8f42a9202cbeeab097ed3e80a2d4c3be3cfed6a7..f95dc963c74aa68afdd2a923fb2add5a774000c9 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -191,6 +191,7 @@ class AwContents : public FindHelper::Listener,
   // BrowserViewRendererClient implementation.
   virtual bool RequestDrawGL(bool wait_for_completion) override;
   virtual void PostInvalidate() override;
+  virtual void InvalidateOnFunctorDestroy() override;
   virtual void UpdateParentDrawConstraints() override;
   virtual void DidSkipCommitFrame() override;
   virtual void OnNewPicture() override;
@@ -242,10 +243,8 @@ class AwContents : public FindHelper::Listener,
   BrowserViewRenderer browser_view_renderer_;
   // SharedRendererState is owned by BrowserViewRenderer.
   // So keep a raw pointer here.
+  // TODO(hush): remove this pointer from AwContents.
   SharedRendererState* shared_renderer_state_;
-  // TODO(hush): hardware renderer will be owned by SharedRendererState,
-  // after DrawGL is moved to SharedRendererState.
-  scoped_ptr<HardwareRenderer> hardware_renderer_;
   scoped_ptr<AwPdfExporter> pdf_exporter_;
   scoped_ptr<PermissionRequestHandler> permission_request_handler_;