WIP - Control the lifetime of RenderThreadManager from Java.

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/render_thread_manager.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/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"
 #include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_contents_lifecycle_notifier.h"
+#include "android_webview/native/aw_gl_functor.h"
 #include "android_webview/native/aw_message_port_service_impl.h"
 #include "android_webview/native/aw_pdf_exporter.h"
 #include "android_webview/native/aw_picture.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "android_webview/native/permission/simple_permission_request.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
@@ skipping 52 matching lines @@
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using data_reduction_proxy::DataReductionProxySettings;
 using navigation_interception::InterceptNavigationDelegate;
 using content::BrowserThread;
 using content::ContentViewCore;
 using content::WebContents;
 
-extern "C" {
-static AwDrawGLFunction DrawGLFunction;
-static void DrawGLFunction(long view_context,
-                           AwDrawGLInfo* draw_info,
-                           void* spare) {
-  // |view_context| is the value that was returned from the java
-  // AwContents.onPrepareDrawGL; this cast must match the code there.
-  reinterpret_cast<android_webview::RenderThreadManager*>(view_context)
-      ->DrawGL(draw_info);
-}
-}
-
 namespace android_webview {
 
 namespace {
 
 bool g_should_download_favicons = false;
 
 bool g_force_auxiliary_bitmap_rendering = false;
 
 std::string g_locale;
 
@@ skipping 52 matching lines @@
 AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(
     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(std::unique_ptr<WebContents> web_contents)
-    : render_thread_manager_(
-          this,
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
+    : functor_(nullptr),
       browser_view_renderer_(
           this,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kDisablePageVisibility)),
       web_contents_(std::move(web_contents)),
       renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) {
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
-  browser_view_renderer_.SetRenderThreadManager(&render_thread_manager_);
   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(
       new PermissionRequestHandler(this, web_contents_.get()));
@@ skipping 92 matching lines @@
       base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, -1);
   // When the last WebView is destroyed free all discardable memory allocated by
   // Chromium, because the app process may continue to run for a long time
   // without ever using another WebView.
   if (instance_count == 0) {
     // TODO(timvolodine): consider moving NotifyMemoryPressure to
     // AwContentsLifecycleNotifier (crbug.com/522988).
     base::MemoryPressureListener::NotifyMemoryPressure(
         base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
   }
+  if (functor_) {

[boliu, 2016/04/07 18:14:03]

SetAwGLFunctor(nullptr) instead to avoid spreading logic. So probably should
factor that out into a private helper method

[Tobias Sargeant, 2016/04/07 21:07:35]

Done.

+    functor_->SetBrowserViewRenderer(nullptr);
+  }
   AwContentsLifecycleNotifier::OnWebViewDestroyed();
 }
 
 base::android::ScopedJavaLocalRef<jobject> AwContents::GetWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(web_contents_);
   if (!web_contents_)
     return base::android::ScopedJavaLocalRef<jobject>();
 
   return web_contents_->GetJavaWebContents();
 }
 
+void AwContents::SetAwGLFunctor(JNIEnv* env,
+                                const base::android::JavaParamRef<jobject>& obj,
+                                jlong gl_functor) {
+  AwGLFunctor* functor = reinterpret_cast<AwGLFunctor*>(gl_functor);
+  if (functor != functor_) {

[boliu, 2016/04/07 18:14:03]

style: you can unindent the rest of the function if you do
if (functor == functor_)
  return;

[Tobias Sargeant, 2016/04/07 21:07:36]

Done.

[boliu, 2016/04/07 21:30:32]

No you didn't :p

+    if (functor_) {
+      functor_->SetBrowserViewRenderer(nullptr);
+    }
+    functor_ = functor;
+    if (functor_) {
+      browser_view_renderer_.SetRenderThreadManager(
+          functor_->GetRenderThreadManager());
+      functor_->SetBrowserViewRenderer(&browser_view_renderer_);
+    } else {
+      browser_view_renderer_.SetRenderThreadManager(nullptr);
+    }
+  }
+}
+
 void AwContents::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   java_ref_.reset();
   delete this;
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jclass>&,
                   const JavaParamRef<jobject>& browser_context) {
   // TODO(joth): Use |browser_context| to get the native BrowserContext, rather
   // than hard-code the default instance lookup here.
@@ skipping 15 matching lines @@
                                      const JavaParamRef<jclass>&,
                                      jlong function_table) {
   RasterHelperSetAwDrawSWFunctionTable(
       reinterpret_cast<AwDrawSWFunctionTable*>(function_table));
 }
 
 static void SetAwDrawGLFunctionTable(JNIEnv* env,
                                      const JavaParamRef<jclass>&,
                                      jlong function_table) {}
 
-static jlong GetAwDrawGLFunction(JNIEnv* env, const JavaParamRef<jclass>&) {
-  return reinterpret_cast<intptr_t>(&DrawGLFunction);
-}
-
 // static
 jint GetNativeInstanceCount(JNIEnv* env, const JavaParamRef<jclass>&) {
   return base::subtle::NoBarrier_Load(&g_instance_count);
 }
 
-jlong AwContents::GetAwDrawGLViewContext(JNIEnv* env,
-                                         const JavaParamRef<jobject>& obj) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return reinterpret_cast<intptr_t>(&render_thread_manager_);
-}
-
 namespace {
 void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message,
                                bool has_images) {
   Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(),
                                               has_images,
                                               message.obj());
 }
 }  // namespace
 
 void AwContents::DocumentHasImages(JNIEnv* env,
@@ skipping 362 matching lines @@
     return;
 
   Java_AwContents_onReceivedTouchIconUrl(
       env, obj.obj(), ConvertUTF8ToJavaString(env, url).obj(), precomposed);
 }
 
 void AwContents::OnParentDrawConstraintsUpdated() {
   browser_view_renderer_.OnParentDrawConstraintsUpdated();
 }
 
-bool AwContents::RequestDrawGL(bool wait_for_completion) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return false;
-  return Java_AwContents_requestDrawGL(env, obj.obj(), wait_for_completion);
-}
-
 void AwContents::PostInvalidate() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null())
     Java_AwContents_postInvalidateOnAnimation(env, obj.obj());
 }
 
 void AwContents::OnNewPicture() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 115 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);
-  render_thread_manager_.DeleteHardwareRendererOnUI();
   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);
-  if (!obj.is_null())
-    Java_AwContents_detachFunctorFromView(env, obj.obj());
-}
-
 base::android::ScopedJavaLocalRef<jbyteArray> AwContents::GetOpaqueState(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Required optimization in WebViewClassic to not save any state if
   // there has been no navigations.
   if (!web_contents_->GetController().GetEntryCount())
     return ScopedJavaLocalRef<jbyteArray>();
 
   base::Pickle pickle;
@@ skipping 311 matching lines @@
   // Not urgent enough. TRIM_MEMORY_UI_HIDDEN is treated specially because
   // it does not indicate memory pressure, but merely that the app is
   // backgrounded.
   if (level < TRIM_MEMORY_RUNNING_LOW || level == TRIM_MEMORY_UI_HIDDEN)
     return;
 
   // Do not release resources on view we expect to get DrawGL soon.
   if (level < TRIM_MEMORY_BACKGROUND && visible)
     return;
 
-  if (level >= TRIM_MEMORY_MODERATE)
-    render_thread_manager_.DeleteHardwareRendererOnUI();
-
   browser_view_renderer_.TrimMemory();
 }
 
 // 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,
@@ skipping 55 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