Move SharedRendererState ownership to AwContents

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 1ab42eba61d13c19799553ae3acb20165d7ac6e0..1a9e163fd18341be482f65a14030cb028bd7fb7e 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -18,6 +18,7 @@
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/icon_helper.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
+#include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/native/permission/permission_request_handler_client.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
@@ -163,6 +164,11 @@ class AwContents : public FindHelper::Listener,
   void OnComputeScroll(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& obj,
                        jlong animation_time_millis);
+
+  void CleanUpUncommittedFrame();

[boliu, 2016/03/23 20:42:33]

new methods should be private

[Tobias Sargeant, 2016/03/24 16:53:05]

Done.

+  void CleanUpReturnedResources();
+
+  bool OnDrawHardware();
   bool OnDraw(JNIEnv* env,
               const base::android::JavaParamRef<jobject>& obj,
               const base::android::JavaParamRef<jobject>& canvas,
@@ -340,6 +346,7 @@ class AwContents : public FindHelper::Listener,
 
   JavaObjectWeakGlobalRef java_ref_;
   BrowserViewRenderer browser_view_renderer_;  // Must outlive |web_contents_|.
+  SharedRendererState shared_renderer_state_;

[boliu, 2016/03/23 20:42:33]

Destruction is in reverse declare order, so as currently implemented, SRS needs
to be above BVR.

Might change after you fix some of these comments though, so be careful here.

   scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
   scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
   scoped_ptr<content::WebContents> web_contents_;