Move SharedRendererState ownership to AwContents

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 3aa233712d3c7e6d85780beabf349db51cba5348..172e4a2ff4d60853222db24a59f9ba82aa2c0e41 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -11,6 +11,7 @@
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/browser/browser_view_renderer.h"
+#include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
@@ -180,12 +181,14 @@ AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(
 
 AwContents::AwContents(scoped_ptr<WebContents> web_contents)
     : browser_view_renderer_(
-          this,
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+          this, BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kDisablePageVisibility)),
+      shared_renderer_state_(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
       web_contents_(std::move(web_contents)),
       renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) {
+  browser_view_renderer_.SetSharedRendererState(&shared_renderer_state_);
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
@@ -440,6 +443,9 @@ bool AwContents::OnReceivedHttpAuthRequest(const JavaRef<jobject>& handler,
 void AwContents::SetOffscreenPreRaster(bool enabled) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetOffscreenPreRaster(enabled);
+  browser_view_renderer_.UpdateMemoryPolicy(
+      browser_view_renderer_.GetInterestRect(
+          shared_renderer_state_.GetParentDrawConstraintsOnUI().is_layer));
 }
 
 void AwContents::AddVisitedLinks(
@@ -889,6 +895,7 @@ void AwContents::OnAttachedToWindow(JNIEnv* env,
 void AwContents::OnDetachedFromWindow(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  shared_renderer_state_.ReleaseCompositorResourcesIfNeededOnUI();
   browser_view_renderer_.OnDetachedFromWindow();
 }
 
@@ -938,6 +945,47 @@ jboolean AwContents::RestoreFromOpaqueState(
   return RestoreFromPickle(&iterator, web_contents_.get());
 }
 
+void AwContents::CleanUpUncommittedFrame() {
+  browser_view_renderer_.ReturnUnusedResource(
+      shared_renderer_state_.PassUncommittedFrameOnUI());
+}
+
+void AwContents::CleanUpReturnedResources() {
+  SharedRendererState::ReturnedResourcesMap returned_resource_map;
+  shared_renderer_state_.SwapReturnedResourcesOnUI(&returned_resource_map);
+
+  for (auto iterator = returned_resource_map.begin();
+       iterator != returned_resource_map.end(); iterator++) {
+    browser_view_renderer_.ReturnResourceFromParent(
+        iterator->first, iterator->second.output_surface_id,
+        &iterator->second.resources);
+  }
+}
+
+bool AwContents::OnDrawHardware() {
+  shared_renderer_state_.InitializeHardwareDrawIfNeededOnUI();
+
+  shared_renderer_state_.SetScrollOffsetOnUI(
+      browser_view_renderer_.last_on_draw_scroll_offset());
+
+  browser_view_renderer_.UpdateMemoryPolicy(
+      browser_view_renderer_.GetInterestRect(
+          shared_renderer_state_.GetParentDrawConstraintsOnUI().is_layer));
+
+  CleanUpReturnedResources();

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

return resources before UpdateMemoryPolicy.

Actually you can just put this near the beginning of OnDraw. Doesn't hurt to
call it more often than needed.

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

Done.

+
+ scoped_ptr<ChildFrame> child_frame = browser_view_renderer_.OnDrawHardware(

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

indent

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

Done.

+      shared_renderer_state_.GetParentDrawConstraintsOnUI());
+
+  if (child_frame.get()) {
+    CleanUpUncommittedFrame();
+    shared_renderer_state_.SetCompositorFrameOnUI(std::move(child_frame));
+    return true;
+  } else {
+    return shared_renderer_state_.HasFrameOnUI();
+  }
+}
+
 bool AwContents::OnDraw(JNIEnv* env,
                         const JavaParamRef<jobject>& obj,
                         const JavaParamRef<jobject>& canvas,
@@ -955,7 +1003,7 @@ bool AwContents::OnDraw(JNIEnv* env,
                         visible_bottom - visible_top));
   if (is_hardware_accelerated && browser_view_renderer_.attached_to_window() &&
       !g_force_auxiliary_bitmap_rendering) {
-    return browser_view_renderer_.OnDrawHardware();
+    return OnDrawHardware();
   }
 
   gfx::Size view_size = browser_view_renderer_.size();
@@ -977,6 +1025,7 @@ bool AwContents::OnDraw(JNIEnv* env,
                          TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
+  CleanUpReturnedResources();
   return browser_view_renderer_.OnDrawSoftware(canvas_holder->GetCanvas());
 }
 
@@ -1209,6 +1258,7 @@ void AwContents::TrimMemory(JNIEnv* env,
                             jboolean visible) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.TrimMemory(level, visible);
+  shared_renderer_state_.TrimMemoryOnUI(level);

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

trim SRS first (to match old code)

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

Done.

 }
 
 // TODO(sgurun) add support for posting a frame whose name is known (only