Move SharedRendererState ownership to AwContents

android_webview/native/aw_contents.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #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"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
 #include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/native/aw_autofill_client.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
@@ skipping 149 matching lines @@
     int render_process_id, int render_frame_id) {
   AwContents* aw_contents = AwContents::FromWebContents(
       content::WebContents::FromRenderFrameHost(
           content::RenderFrameHost::FromID(render_process_id,
                                            render_frame_id)));
   return aw_contents;
 }
 
 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);
   web_contents_->SetUserData(android_webview::kAwContentsUserDataKey,
                              new AwContentsUserData(this));
   browser_view_renderer_.RegisterWithWebContents(web_contents_.get());
   render_view_host_ext_.reset(
       new AwRenderViewHostExt(this, web_contents_.get()));
 
   permission_request_handler_.reset(
@@ skipping 234 matching lines @@
   devtools_instrumentation::ScopedEmbedderCallbackTask embedder_callback(
       "onReceivedHttpAuthRequest");
   Java_AwContents_onReceivedHttpAuthRequest(env, obj.obj(), handler.obj(),
       jhost.obj(), jrealm.obj());
   return true;
 }
 
 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(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobjectArray>& jvisited_links) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::vector<base::string16> visited_link_strings;
   base::android::AppendJavaStringArrayToStringVector(
       env, jvisited_links, &visited_link_strings);
@@ skipping 429 matching lines @@
                                     const JavaParamRef<jobject>& obj,
                                     int w,
                                     int h) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.OnAttachedToWindow(w, h);
 }
 
 void AwContents::OnDetachedFromWindow(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  shared_renderer_state_.ReleaseCompositorResourcesIfNeededOnUI();
   browser_view_renderer_.OnDetachedFromWindow();
 }
 
 bool AwContents::IsVisible(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return browser_view_renderer_.IsClientVisible();
 }
 
 void AwContents::DetachFunctorFromView() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
@@ skipping 29 matching lines @@
   std::vector<uint8_t> state_vector;
   base::android::JavaByteArrayToByteVector(env, state, &state_vector);
 
   base::Pickle pickle(reinterpret_cast<const char*>(state_vector.data()),
                       state_vector.size());
   base::PickleIterator iterator(pickle);
 
   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,
                         jboolean is_hardware_accelerated,
                         jint scroll_x,
                         jint scroll_y,
                         jint visible_left,
                         jint visible_top,
                         jint visible_right,
                         jint visible_bottom) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   gfx::Vector2d scroll(scroll_x, scroll_y);
   browser_view_renderer_.PrepareToDraw(
       scroll, gfx::Rect(visible_left, visible_top, visible_right - visible_left,
                         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();
   if (view_size.IsEmpty()) {
     TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_EmptySize",
                          TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   // TODO(hush): Right now webview size is passed in as the auxiliary bitmap
   // size, which might hurt performace (only for software draws with auxiliary
   // bitmap). For better performance, get global visible rect, transform it
   // from screen space to view space, then intersect with the webview in
   // viewspace.  Use the resulting rect as the auxiliary bitmap.
   scoped_ptr<SoftwareCanvasHolder> canvas_holder = SoftwareCanvasHolder::Create(
       canvas, scroll, view_size, g_force_auxiliary_bitmap_rendering);
   if (!canvas_holder || !canvas_holder->GetCanvas()) {
     TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_NoSoftwareCanvas",
                          TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
+  CleanUpReturnedResources();
   return browser_view_renderer_.OnDrawSoftware(canvas_holder->GetCanvas());
 }
 
 void AwContents::SetPendingWebContentsForPopup(
     scoped_ptr<content::WebContents> pending) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (pending_contents_.get()) {
     // TODO(benm): Support holding multiple pop up window requests.
     LOG(WARNING) << "Blocking popup window creation as an outstanding "
                  << "popup window is still pending.";
@@ skipping 212 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   render_view_host_ext_->SetJsOnlineProperty(network_up);
 }
 
 void AwContents::TrimMemory(JNIEnv* env,
                             const JavaParamRef<jobject>& obj,
                             jint level,
                             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
 //               main frame is supported at this time, see crbug.com/389721)
 void AwContents::PostMessageToFrame(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     const JavaParamRef<jstring>& frame_name,
                                     const JavaParamRef<jstring>& message,
                                     const JavaParamRef<jstring>& target_origin,
                                     const JavaParamRef<jintArray>& sent_ports) {
@@ skipping 54 matching lines @@
     const JavaParamRef<jobject>& obj) {
   web_contents_->ResumeLoadingCreatedWebContents();
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env,
                                const JavaParamRef<jclass>& jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview