WIP - Control the lifetime of RenderThreadManager from Java.

android_webview/native/aw_contents.h

 // Copyright (c) 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.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 
 #include <jni.h>
 
 #include <list>
@@ skipping 22 matching lines @@
 struct AwDrawGLInfo;
 
 namespace content {
 class WebContents;
 }
 
 namespace android_webview {
 
 class AwContentsContainer;
 class AwContentsClientBridge;
+class AwGLFunctor;
 class AwPdfExporter;
 class AwWebContentsDelegate;
 class HardwareRenderer;
 class PermissionRequestHandler;
 
 // Native side of java-class of same name.
 // Provides the ownership of and access to browser components required for
 // WebView functionality; analogous to chrome's TabContents, but with a
 // level of indirection provided by the AwContentsContainer abstraction.
 //
 // Object lifetime:
 // For most purposes the java and native objects can be considered to have
 // 1:1 lifetime and relationship. The exception is the java instance that
 // hosts a popup will be rebound to a second native instance (carrying the
 // popup content) and discard the 'default' native instance it made on
 // construction. A native instance is only bound to at most one Java peer over
 // its entire lifetime - see Init() and SetPendingWebContentsForPopup() for the
 // construction points, and SetJavaPeers() where these paths join.
 class AwContents : public FindHelper::Listener,
                    public IconHelper::Listener,
                    public AwRenderViewHostExtClient,
                    public BrowserViewRendererClient,
                    public PermissionRequestHandlerClient,
-                   public AwBrowserPermissionRequestDelegate,
-                   public RenderThreadManagerClient {
+                   public AwBrowserPermissionRequestDelegate {
  public:
   // Returns the AwContents instance associated with |web_contents|, or NULL.
   static AwContents* FromWebContents(content::WebContents* web_contents);
 
   // Returns the AwContents instance associated with with the given
   // render_process_id and render_view_id, or NULL.
   static AwContents* FromID(int render_process_id, int render_view_id);
 
   static std::string GetLocale();
 
@@ skipping 18 matching lines @@
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& aw_contents,
       const base::android::JavaParamRef<jobject>& web_contents_delegate,
       const base::android::JavaParamRef<jobject>& contents_client_bridge,
       const base::android::JavaParamRef<jobject>& io_thread_client,
       const base::android::JavaParamRef<jobject>&
           intercept_navigation_delegate);
   base::android::ScopedJavaLocalRef<jobject> GetWebContents(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
+  void SetAwGLFunctor(JNIEnv* env,
+                      const base::android::JavaParamRef<jobject>& obj,
+                      jlong gl_functor);
 
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void DocumentHasImages(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          const base::android::JavaParamRef<jobject>& message);
   void GenerateMHTML(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& obj,
                      const base::android::JavaParamRef<jstring>& jpath,
                      const base::android::JavaParamRef<jobject>& callback);
   void CreatePdfExporter(
@@ skipping 57 matching lines @@
   bool OnDraw(JNIEnv* env,
               const base::android::JavaParamRef<jobject>& obj,
               const base::android::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);
-  jlong GetAwDrawGLViewContext(JNIEnv* env,
-                               const base::android::JavaParamRef<jobject>& obj);
   jlong CapturePicture(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& obj,
                        int width,
                        int height);
   void EnableOnNewPicture(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj,
                           jboolean enabled);
   void InsertVisualStateCallback(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
@@ skipping 35 matching lines @@
       const GURL& origin) override;
   void RequestGeolocationPermission(
       const GURL& origin,
       const base::Callback<void(bool)>& callback) override;
   void CancelGeolocationPermissionRequests(const GURL& origin) override;
   void RequestMIDISysexPermission(
       const GURL& origin,
       const base::Callback<void(bool)>& callback) override;
   void CancelMIDISysexPermissionRequests(const GURL& origin) override;
 
-  // RenderThreadManagerClient implementation.
-  void OnParentDrawConstraintsUpdated() override;
-  bool RequestDrawGL(bool wait_for_completion) override;
-  void DetachFunctorFromView() override;
+  // ex-SharedRendererStateClient implementation.
+  void OnParentDrawConstraintsUpdated();
 
   // Find-in-page API and related methods.
   void FindAllAsync(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     const base::android::JavaParamRef<jstring>& search_string);
   void FindNext(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj,
                 jboolean forward);
   void ClearMatches(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj);
@@ skipping 85 matching lines @@
 
  private:
   void InitAutofillIfNecessary(bool enabled);
 
   // Geolocation API support
   void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
   void HideGeolocationPrompt(const GURL& origin);
 
   void SetDipScaleInternal(float dip_scale);
 
+  void SetAwGLFunctor(AwGLFunctor* functor);
+
   JavaObjectWeakGlobalRef java_ref_;
-  RenderThreadManager render_thread_manager_;
+  AwGLFunctor* functor_;
   BrowserViewRenderer browser_view_renderer_;  // Must outlive |web_contents_|.
   std::unique_ptr<AwWebContentsDelegate> web_contents_delegate_;
   std::unique_ptr<AwContentsClientBridge> contents_client_bridge_;
   std::unique_ptr<content::WebContents> web_contents_;
   std::unique_ptr<AwRenderViewHostExt> render_view_host_ext_;
   std::unique_ptr<FindHelper> find_helper_;
   std::unique_ptr<IconHelper> icon_helper_;
   std::unique_ptr<AwContents> pending_contents_;
   std::unique_ptr<AwPdfExporter> pdf_exporter_;
   std::unique_ptr<PermissionRequestHandler> permission_request_handler_;
   scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_;
 
   // GURL is supplied by the content layer as requesting frame.
   // Callback is supplied by the content layer, and is invoked with the result
   // from the permission prompt.
   typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback;
   // The first element in the list is always the currently pending request.
   std::list<OriginCallback> pending_geolocation_prompts_;
 
   GLViewRendererManager::Key renderer_manager_key_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_