Remove android_webview/browser layer's dependency on native

Remove android_webview/browser layer's dependency on native/

Exposed a function BrowserViewRenderer::FromWebContents to allow
android_webview/browser/ layer to get hold of the instance of
BrowserViewRenderer through WebContents, without the help of AwContents,
which is in android_webview/native/ layer.

BUG=459779, 460826
Committed: https://crrev.com/7d13f84e80288f530a99d4ef635e4976d43211ef
Cr-Commit-Position: refs/heads/master@{#318264}

[hush (inactive), 2015-02-24 00:46:11]

hush@chromium.org changed reviewers:
+ sgurun@chromium.org

[hush (inactive), 2015-02-24 00:46:12]

This is a re-land of https://codereview.chromium.org/937863003/.
The previous CL didn't clear the dependency from browser/ to native/ completely
(see the one in aw_dev_tools) and broke the check_deps in linux build bot.

[wfa511com, 2015-02-24 00:58:41]

بتاريخ Feb 24, 2015 3:46 AM، كتبها <hush@chromium.org>:

> Reviewers: sgurun,
>
> Message:
> This is a re-land of https://codereview.chromium.org/937863003/.
> The previous CL didn't clear the dependency from browser/ to native/
> completely
> (see the one in aw_dev_tools) and broke the check_deps in linux build bot.
>
> Description:
> Add AwAssets into android_webview/native/public
>
> This is done so that android_webview/browser doesn't need to depend on
> android_webview/native.
>
> Also exposed a function BrowserViewRenderer::FromWebContents to allow
> android_webview/browser/ layer to get hold of the instance of
> BrowserViewRenderer through WebContents, without the help of AwContents,
> which is in android_webview/native/ layer.
>
> BUG=459779, 460826
>
> Please review this at https://codereview.chromium.org/950973003/
>
> Base URL: https://chromium.googlesource.com/chromium/src.git@master
>
> Affected files (+47, -5 lines):
>   M android_webview/browser/aw_dev_tools_manager_delegate.cc
>   M android_webview/browser/browser_view_renderer.h
>   M android_webview/browser/browser_view_renderer.cc
>   M android_webview/native/aw_contents.cc
>
>
> Index: android_webview/browser/aw_dev_tools_manager_delegate.cc
> diff --git a/android_webview/browser/aw_dev_tools_manager_delegate.cc
> b/android_webview/browser/aw_dev_tools_manager_delegate.cc
> index c1f2e3f5c5c42072e28032fc79ac75686a2b007f..
> 1b3517ddc4407d50333c976facccee6e15d28d99 100644
> --- a/android_webview/browser/aw_dev_tools_manager_delegate.cc
> +++ b/android_webview/browser/aw_dev_tools_manager_delegate.cc
> @@ -4,7 +4,7 @@
>
>  #include "android_webview/browser/aw_dev_tools_manager_delegate.h"
>
> -#include "android_webview/native/aw_contents.h"
> +#include "android_webview/browser/browser_view_renderer.h"
>  #include "base/bind.h"
>  #include "base/json/json_writer.h"
>  #include "base/strings/stringprintf.h"
> @@ -72,9 +72,8 @@ Target::Target(scoped_refptr<DevToolsAgentHost>
> agent_host)
>  }
>
>  std::string GetViewDescription(WebContents* web_contents) {
> -  const android_webview::BrowserViewRenderer* bvr =
> -      android_webview::AwContents::FromWebContents(web_contents)
> -          ->GetBrowserViewRenderer();
> +  android_webview::BrowserViewRenderer* bvr =
> +      android_webview::BrowserViewRenderer::
> FromWebContents(web_contents);
>    if (!bvr) return "";
>    base::DictionaryValue description;
>    description.SetBoolean("attached", bvr->attached_to_window());
> Index: android_webview/browser/browser_view_renderer.cc
> diff --git a/android_webview/browser/browser_view_renderer.cc
> b/android_webview/browser/browser_view_renderer.cc
> index c2de48b16c75b110ef37d3cf5a35e1e94adc9310..
> 3d4bc93f982c43a169ce7daba5e38193e2897cb1 100644
> --- a/android_webview/browser/browser_view_renderer.cc
> +++ b/android_webview/browser/browser_view_renderer.cc
> @@ -10,8 +10,10 @@
>  #include "base/logging.h"
>  #include "base/strings/string_number_conversions.h"
>  #include "base/strings/stringprintf.h"
> +#include "base/supports_user_data.h"
>  #include "base/trace_event/trace_event_argument.h"
>  #include "cc/output/compositor_frame.h"
> +#include "content/public/browser/web_contents.h"
>  #include "content/public/common/content_switches.h"
>  #include "gpu/command_buffer/service/gpu_switches.h"
>  #include "third_party/skia/include/core/SkBitmap.h"
> @@ -34,6 +36,26 @@ const size_t kBytesPerPixel = 4;
>  const size_t kMemoryAllocationStep = 5 * 1024 * 1024;
>  uint64 g_memory_override_in_bytes = 0u;
>
> +const void* kBrowserViewRendererUserDataKey = &
> kBrowserViewRendererUserDataKey;
> +
> +class BrowserViewRendererUserData : public base::SupportsUserData::Data {
> + public:
> +  BrowserViewRendererUserData(BrowserViewRenderer* ptr) : bvr_(ptr) {}
> +
> +  static BrowserViewRenderer* GetBrowserViewRenderer(
> +      content::WebContents* web_contents) {
> +    if (!web_contents)
> +      return NULL;
> +    BrowserViewRendererUserData* data =
> +        static_cast<BrowserViewRendererUserData*>(
> +            web_contents->GetUserData(kBrowserViewRendererUserDataKey));
> +    return data ? data->bvr_ : NULL;
> +  }
> +
> + private:
> +  BrowserViewRenderer* bvr_;
> +};
> +
>  }  // namespace
>
>  // static
> @@ -52,6 +74,12 @@ void BrowserViewRenderer::CalculateTileMemoryPolicy() {
>    }
>  }
>
> +// static
> +BrowserViewRenderer* BrowserViewRenderer::FromWebContents(
> +    content::WebContents* web_contents) {
> +  return BrowserViewRendererUserData::GetBrowserViewRenderer(web_
> contents);
> +}
> +
>  BrowserViewRenderer::BrowserViewRenderer(
>      BrowserViewRendererClient* client,
>      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
> @@ -77,6 +105,12 @@ BrowserViewRenderer::BrowserViewRenderer(
>  BrowserViewRenderer::~BrowserViewRenderer() {
>  }
>
> +void BrowserViewRenderer::RegisterWithWebContents(
> +    content::WebContents* web_contents) {
> +  web_contents->SetUserData(kBrowserViewRendererUserDataKey,
> +                            new BrowserViewRendererUserData(this));
> +}
> +
>  SharedRendererState* BrowserViewRenderer::GetAwDrawGLViewContext() {
>    return &shared_renderer_state_;
>  }
> Index: android_webview/browser/browser_view_renderer.h
> diff --git a/android_webview/browser/browser_view_renderer.h
> b/android_webview/browser/browser_view_renderer.h
> index e47104936c96b0c63e915e74c37364275227d8c0..
> 00cf4e7b2c1637726df476279eaa39268810db78 100644
> --- a/android_webview/browser/browser_view_renderer.h
> +++ b/android_webview/browser/browser_view_renderer.h
> @@ -18,6 +18,10 @@
>  class SkCanvas;
>  class SkPicture;
>
> +namespace content {
> +class WebContents;
> +}
> +
>  namespace android_webview {
>
>  class BrowserViewRendererClient;
> @@ -27,6 +31,8 @@ class BrowserViewRendererClient;
>  class BrowserViewRenderer : public content::SynchronousCompositorClient {
>   public:
>    static void CalculateTileMemoryPolicy();
> +  static BrowserViewRenderer* FromWebContents(
> +      content::WebContents* web_contents);
>
>    BrowserViewRenderer(
>        BrowserViewRendererClient* client,
> @@ -34,6 +40,8 @@ class BrowserViewRenderer : public
content::SynchronousCompositorClient
> {
>
>    ~BrowserViewRenderer() override;
>
> +  void RegisterWithWebContents(content::WebContents* web_contents);
> +
>    SharedRendererState* GetAwDrawGLViewContext();
>    bool RequestDrawGL(bool wait_for_completion);
>
> Index: android_webview/native/aw_contents.cc
> diff --git a/android_webview/native/aw_contents.cc
> b/android_webview/native/aw_contents.cc
> index c3c311096bd021e7166ad44ef521c46255ae6536..
> b460dbcb733d8f236b559691d0e81e57aee47703 100644
> --- a/android_webview/native/aw_contents.cc
> +++ b/android_webview/native/aw_contents.cc
> @@ -170,8 +170,9 @@ AwContents::AwContents(scoped_ptr<WebContents>
> web_contents)
>    base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
>    icon_helper_.reset(new IconHelper(web_contents_.get()));
>    icon_helper_->SetListener(this);
> -  web_contents_->SetUserData(kAwContentsUserDataKey,
> +  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()));
>
>
>
> To unsubscribe from this group and stop receiving emails from it, send an
> email to chromium-reviews+unsubscribe@chromium.org.
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[sgurun-gerrit only, 2015-02-26 00:10:41]

sgurun@chromium.org changed reviewers:
+ mnaganov@chromium.org
- sgurun@chromium.org, wfa511com@gmail.com

[sgurun-gerrit only, 2015-02-26 00:11:11]

On 2015/02/24 00:58:41, wfa511com wrote:
> بتاريخ Feb 24, 2015 3:46 AM، كتبها <mailto:hush@chromium.org>:
> 
> > Reviewers: sgurun,
> >
> > Message:
> > This is a re-land of https://codereview.chromium.org/937863003/.
> > The previous CL didn't clear the dependency from browser/ to native/
> > completely
> > (see the one in aw_dev_tools) and broke the check_deps in linux build bot.
> >
> > Description:
> > Add AwAssets into android_webview/native/public
> >
> > This is done so that android_webview/browser doesn't need to depend on
> > android_webview/native.
> >
> > Also exposed a function BrowserViewRenderer::FromWebContents to allow
> > android_webview/browser/ layer to get hold of the instance of
> > BrowserViewRenderer through WebContents, without the help of AwContents,
> > which is in android_webview/native/ layer.
> >
> > BUG=459779, 460826
> >
> > Please review this at https://codereview.chromium.org/950973003/
> >
> > Base URL: https://chromium.googlesource.com/chromium/src.git@master
> >
> > Affected files (+47, -5 lines):
> >   M android_webview/browser/aw_dev_tools_manager_delegate.cc
> >   M android_webview/browser/browser_view_renderer.h
> >   M android_webview/browser/browser_view_renderer.cc
> >   M android_webview/native/aw_contents.cc
> >
> >
> > Index: android_webview/browser/aw_dev_tools_manager_delegate.cc
> > diff --git a/android_webview/browser/aw_dev_tools_manager_delegate.cc
> > b/android_webview/browser/aw_dev_tools_manager_delegate.cc
> > index c1f2e3f5c5c42072e28032fc79ac75686a2b007f..
> > 1b3517ddc4407d50333c976facccee6e15d28d99 100644
> > --- a/android_webview/browser/aw_dev_tools_manager_delegate.cc
> > +++ b/android_webview/browser/aw_dev_tools_manager_delegate.cc
> > @@ -4,7 +4,7 @@
> >
> >  #include "android_webview/browser/aw_dev_tools_manager_delegate.h"
> >
> > -#include "android_webview/native/aw_contents.h"
> > +#include "android_webview/browser/browser_view_renderer.h"
> >  #include "base/bind.h"
> >  #include "base/json/json_writer.h"
> >  #include "base/strings/stringprintf.h"
> > @@ -72,9 +72,8 @@ Target::Target(scoped_refptr<DevToolsAgentHost>
> > agent_host)
> >  }
> >
> >  std::string GetViewDescription(WebContents* web_contents) {
> > -  const android_webview::BrowserViewRenderer* bvr =
> > -      android_webview::AwContents::FromWebContents(web_contents)
> > -          ->GetBrowserViewRenderer();
> > +  android_webview::BrowserViewRenderer* bvr =
> > +      android_webview::BrowserViewRenderer::
> > FromWebContents(web_contents);
> >    if (!bvr) return "";
> >    base::DictionaryValue description;
> >    description.SetBoolean("attached", bvr->attached_to_window());
> > Index: android_webview/browser/browser_view_renderer.cc
> > diff --git a/android_webview/browser/browser_view_renderer.cc
> > b/android_webview/browser/browser_view_renderer.cc
> > index c2de48b16c75b110ef37d3cf5a35e1e94adc9310..
> > 3d4bc93f982c43a169ce7daba5e38193e2897cb1 100644
> > --- a/android_webview/browser/browser_view_renderer.cc
> > +++ b/android_webview/browser/browser_view_renderer.cc
> > @@ -10,8 +10,10 @@
> >  #include "base/logging.h"
> >  #include "base/strings/string_number_conversions.h"
> >  #include "base/strings/stringprintf.h"
> > +#include "base/supports_user_data.h"
> >  #include "base/trace_event/trace_event_argument.h"
> >  #include "cc/output/compositor_frame.h"
> > +#include "content/public/browser/web_contents.h"
> >  #include "content/public/common/content_switches.h"
> >  #include "gpu/command_buffer/service/gpu_switches.h"
> >  #include "third_party/skia/include/core/SkBitmap.h"
> > @@ -34,6 +36,26 @@ const size_t kBytesPerPixel = 4;
> >  const size_t kMemoryAllocationStep = 5 * 1024 * 1024;
> >  uint64 g_memory_override_in_bytes = 0u;
> >
> > +const void* kBrowserViewRendererUserDataKey = &
> > kBrowserViewRendererUserDataKey;
> > +
> > +class BrowserViewRendererUserData : public base::SupportsUserData::Data {
> > + public:
> > +  BrowserViewRendererUserData(BrowserViewRenderer* ptr) : bvr_(ptr) {}
> > +
> > +  static BrowserViewRenderer* GetBrowserViewRenderer(
> > +      content::WebContents* web_contents) {
> > +    if (!web_contents)
> > +      return NULL;
> > +    BrowserViewRendererUserData* data =
> > +        static_cast<BrowserViewRendererUserData*>(
> > +            web_contents->GetUserData(kBrowserViewRendererUserDataKey));
> > +    return data ? data->bvr_ : NULL;
> > +  }
> > +
> > + private:
> > +  BrowserViewRenderer* bvr_;
> > +};
> > +
> >  }  // namespace
> >
> >  // static
> > @@ -52,6 +74,12 @@ void BrowserViewRenderer::CalculateTileMemoryPolicy() {
> >    }
> >  }
> >
> > +// static
> > +BrowserViewRenderer* BrowserViewRenderer::FromWebContents(
> > +    content::WebContents* web_contents) {
> > +  return BrowserViewRendererUserData::GetBrowserViewRenderer(web_
> > contents);
> > +}
> > +
> >  BrowserViewRenderer::BrowserViewRenderer(
> >      BrowserViewRendererClient* client,
> >      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
> > @@ -77,6 +105,12 @@ BrowserViewRenderer::BrowserViewRenderer(
> >  BrowserViewRenderer::~BrowserViewRenderer() {
> >  }
> >
> > +void BrowserViewRenderer::RegisterWithWebContents(
> > +    content::WebContents* web_contents) {
> > +  web_contents->SetUserData(kBrowserViewRendererUserDataKey,
> > +                            new BrowserViewRendererUserData(this));
> > +}
> > +
> >  SharedRendererState* BrowserViewRenderer::GetAwDrawGLViewContext() {
> >    return &shared_renderer_state_;
> >  }
> > Index: android_webview/browser/browser_view_renderer.h
> > diff --git a/android_webview/browser/browser_view_renderer.h
> > b/android_webview/browser/browser_view_renderer.h
> > index e47104936c96b0c63e915e74c37364275227d8c0..
> > 00cf4e7b2c1637726df476279eaa39268810db78 100644
> > --- a/android_webview/browser/browser_view_renderer.h
> > +++ b/android_webview/browser/browser_view_renderer.h
> > @@ -18,6 +18,10 @@
> >  class SkCanvas;
> >  class SkPicture;
> >
> > +namespace content {
> > +class WebContents;
> > +}
> > +
> >  namespace android_webview {
> >
> >  class BrowserViewRendererClient;
> > @@ -27,6 +31,8 @@ class BrowserViewRendererClient;
> >  class BrowserViewRenderer : public content::SynchronousCompositorClient {
> >   public:
> >    static void CalculateTileMemoryPolicy();
> > +  static BrowserViewRenderer* FromWebContents(
> > +      content::WebContents* web_contents);
> >
> >    BrowserViewRenderer(
> >        BrowserViewRendererClient* client,
> > @@ -34,6 +40,8 @@ class BrowserViewRenderer : public
> content::SynchronousCompositorClient
> > {
> >
> >    ~BrowserViewRenderer() override;
> >
> > +  void RegisterWithWebContents(content::WebContents* web_contents);
> > +
> >    SharedRendererState* GetAwDrawGLViewContext();
> >    bool RequestDrawGL(bool wait_for_completion);
> >
> > Index: android_webview/native/aw_contents.cc
> > diff --git a/android_webview/native/aw_contents.cc
> > b/android_webview/native/aw_contents.cc
> > index c3c311096bd021e7166ad44ef521c46255ae6536..
> > b460dbcb733d8f236b559691d0e81e57aee47703 100644
> > --- a/android_webview/native/aw_contents.cc
> > +++ b/android_webview/native/aw_contents.cc
> > @@ -170,8 +170,9 @@ AwContents::AwContents(scoped_ptr<WebContents>
> > web_contents)
> >    base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
> >    icon_helper_.reset(new IconHelper(web_contents_.get()));
> >    icon_helper_->SetListener(this);
> > -  web_contents_->SetUserData(kAwContentsUserDataKey,
> > +  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()));
> >
> >
> >
> > To unsubscribe from this group and stop receiving emails from it, send an
> > email to mailto:chromium-reviews+unsubscribe@chromium.org.
> >
> 
> To unsubscribe from this group and stop receiving emails from it, send an
email
> to mailto:chromium-reviews+unsubscribe@chromium.org.

passing to @mnaganov since it is touching to dev tools.

[mnaganov (inactive), 2015-02-26 08:33:25]

lgtm

[hush (inactive), 2015-02-26 17:55:49]

The CQ bit was checked by hush@chromium.org

[commit-bot: I haz the power, 2015-02-26 17:56:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/950973003/20001

[hush (inactive), 2015-02-26 17:57:48]

The CQ bit was unchecked by hush@chromium.org

[hush (inactive), 2015-02-26 17:58:53]

The CQ bit was checked by hush@chromium.org

[commit-bot: I haz the power, 2015-02-26 17:59:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/950973003/20001

[commit-bot: I haz the power, 2015-02-26 18:32:19]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-02-26 18:32:56]

Patchset 2 (id:??) landed as
https://crrev.com/7d13f84e80288f530a99d4ef635e4976d43211ef
Cr-Commit-Position: refs/heads/master@{#318264}