Part 2: WIP Refactor Webview graphics related code

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 173 matching lines @@
 
   // AwRenderViewHostExtClient implementation.
   virtual void OnWebLayoutPageScaleFactorChanged(
       float page_scale_factor) override;
   virtual void OnWebLayoutContentsSizeChanged(
       const gfx::Size& contents_size) override;
 
   // BrowserViewRendererClient implementation.
   virtual bool RequestDrawGL(bool wait_for_completion) override;
   virtual void PostInvalidate() override;
+  virtual void InvalidateOnFunctorDestroy() override;
   virtual void UpdateParentDrawConstraints() override;
   virtual void DidSkipCommitFrame() override;
   virtual void OnNewPicture() override;
   virtual gfx::Point GetLocationOnScreen() override;
   virtual void ScrollContainerViewTo(gfx::Vector2d new_value) override;
   virtual bool IsFlingActive() const override;
   virtual void UpdateScrollState(gfx::Vector2d max_scroll_offset,
                                  gfx::SizeF contents_size_dip,
                                  float page_scale_factor,
                                  float min_page_scale_factor,
@@ skipping 31 matching lines @@
   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_;
   BrowserViewRenderer browser_view_renderer_;
   // SharedRendererState is owned by BrowserViewRenderer.
   // So keep a raw pointer here.
   SharedRendererState* shared_renderer_state_;

[boliu, 2014/10/28 19:49:43]

At _some_ point in the future, we should be able to remove this pointer as well.

[hush (inactive), 2014/10/29 19:57:04]

Yes, hopefully. Added a TODO here.
I guess one major thing is DrawGL functor registration.
Right now AwContents::DrawGL is registered as the functor. To remove this
pointer, we need to register SharedRendererState::DrawGL instead? So that
AwContents does not need to forward the call to SharedRendererState. But that
breaks the assumption that AwContents being the boundary between java and native
and exposes the existence of SRS to android frameworks somehow.

[boliu, 2014/10/29 22:40:33]

Yeah that's the idea I have in my head.
The other side of functor isn't java though. Also to frameworks, it's just an
opaque pointer, we are not exposing anything.

[hush (inactive), 2014/10/30 00:46:36]

filed https://code.google.com/p/chromium/issues/detail?id=428550 for it.

-  // TODO(hush): hardware renderer will be owned by SharedRendererState,
-  // after DrawGL is moved to SharedRendererState.
-  scoped_ptr<HardwareRenderer> hardware_renderer_;
   scoped_ptr<AwPdfExporter> pdf_exporter_;
   scoped_ptr<PermissionRequestHandler> permission_request_handler_;
 
   // 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_;
 
   base::Lock render_thread_lock_;
   GLViewRendererManager::Key renderer_manager_key_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_