Move SharedRendererState ownership to AwContents

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>
 #include <string>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
 #include "android_webview/browser/aw_message_port_message_filter.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/find_helper.h"
 #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/browser/shared_renderer_state_client.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"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 class SkBitmap;
 class TabContents;
 struct AwDrawGLInfo;
@@ skipping 22 matching lines @@
 // 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 AwBrowserPermissionRequestDelegate,
+                   public SharedRendererStateClient {
  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 149 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;
 
+  // SharedRendererStateClient implementation.
+  void UpdateParentDrawConstraints() override;
+  bool RequestDrawGL(bool wait_for_completion) override;
+  void DetachFunctorFromView() override;
+
   // 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);
   FindHelper* GetFindHelper();
 
   // Per WebView Cookie Policy
   bool AllowThirdPartyCookies();
 
   // FindHelper::Listener implementation.
   void OnFindResultReceived(int active_ordinal,
                             int match_count,
                             bool finished) override;
   // IconHelper::Listener implementation.
   bool ShouldDownloadFavicon(const GURL& icon_url) override;
   void OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) override;
   void OnReceivedTouchIconUrl(const std::string& url,
                               const bool precomposed) override;
 
   // AwRenderViewHostExtClient implementation.
   void OnWebLayoutPageScaleFactorChanged(float page_scale_factor) override;
   void OnWebLayoutContentsSizeChanged(const gfx::Size& contents_size) override;
 
   // BrowserViewRendererClient implementation.
-  bool RequestDrawGL(bool wait_for_completion) override;
   void PostInvalidate() override;
-  void DetachFunctorFromView() override;
   void OnNewPicture() override;
   gfx::Point GetLocationOnScreen() override;
   void ScrollContainerViewTo(const gfx::Vector2d& new_value) override;
   void UpdateScrollState(const gfx::Vector2d& max_scroll_offset,
                          const gfx::SizeF& contents_size_dip,
                          float page_scale_factor,
                          float min_page_scale_factor,
                          float max_page_scale_factor) override;
   void DidOverscroll(const gfx::Vector2d& overscroll_delta,
                      const gfx::Vector2dF& overscroll_velocity) override;
@@ skipping 48 matching lines @@
 
   void GrantFileSchemeAccesstoChildProcess(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
   void ResumeLoadingCreatedPopupWebContents(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
  private:
+  void CleanUpUncommittedFrame();
+  void CleanUpReturnedResources();
+
+  bool OnDrawHardware(const gfx::Vector2d& scroll);
+  bool OnDrawSoftware(const base::android::JavaRef<jobject>& canvas,
+                      const gfx::Vector2d& scroll);

[boliu, 2016/03/30 16:12:13]

these new methods don't exist anymore

[Tobias Sargeant, 2016/03/30 17:17:17]

Done.

+
   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);
 
   JavaObjectWeakGlobalRef java_ref_;
+  SharedRendererState shared_renderer_state_;
   BrowserViewRenderer browser_view_renderer_;  // Must outlive |web_contents_|.
   scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
   scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
   scoped_ptr<FindHelper> find_helper_;
   scoped_ptr<IconHelper> icon_helper_;
   scoped_ptr<AwContents> pending_contents_;
   scoped_ptr<AwPdfExporter> pdf_exporter_;
   scoped_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_