aw: Split hardware rendering into HardwareRenderer

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>
@@ skipping 31 matching lines @@
 // 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 BrowserViewRenderer::Client {
+                   public BrowserViewRendererClient {
  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);
 
   AwContents(scoped_ptr<content::WebContents> web_contents);
   virtual ~AwContents();
@@ skipping 102 matching lines @@
       gfx::Vector2d new_value) OVERRIDE;
   virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
   virtual bool IsFlingActive() const OVERRIDE;
   virtual void SetPageScaleFactorAndLimits(
       float page_scale_factor,
       float min_page_scale_factor,
       float max_page_scale_factor) OVERRIDE;
   virtual void SetContentsSize(gfx::SizeF contents_size_dip) OVERRIDE;
   virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
 
+  const BrowserViewRenderer* GetBrowserViewRenderer() const;
+
   void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
   jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
 
   void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y);
   void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale);
   void SetFixedLayoutSize(JNIEnv* env,
                           jobject obj,
                           jint width_dip,
                           jint height_dip);
@@ skipping 10 matching lines @@
   void SetAndroidWebViewRendererPrefs();
 
   JavaObjectWeakGlobalRef java_ref_;
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
   scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
   scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
   scoped_ptr<FindHelper> find_helper_;
   scoped_ptr<IconHelper> icon_helper_;
   scoped_ptr<AwContents> pending_contents_;
-  scoped_ptr<BrowserViewRenderer> browser_view_renderer_;
+  BrowserViewRenderer browser_view_renderer_;
   scoped_ptr<AwPdfExporter> pdf_exporter_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_