[Android WebView] Provide more information about WebView for web debugging

android_webview/browser/browser_view_renderer_impl.cc

 // Copyright (c) 2013 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.
 
 #include "android_webview/browser/browser_view_renderer_impl.h"
 
 #include <android/bitmap.h>
 #include <sys/system_properties.h>
 
 #include "android_webview/common/renderer_picture_map.h"
@@ skipping 86 matching lines @@
     return false;
   }
 
   return succeeded;
 }
 
 }  // namespace
 
 namespace android_webview {
 
+namespace {
+
+const void* kBrowserViewRendererUserDataKey = &kBrowserViewRendererUserDataKey;
+
+class BrowserViewRendererUserData : public base::SupportsUserData::Data {

[joth, 2013/03/11 16:36:12]

ah no - afraid we duplicated work here..!
Mine's already in CQ so I think you'll need to rebase.
https://codereview.chromium.org/12668003/diff/11001/android_webview/browser/b...

+ public:
+  BrowserViewRendererUserData(BrowserViewRenderer* ptr) : bvr_(ptr) {}
+
+  static BrowserViewRenderer* GetBrowserViewRenderer(
+      content::WebContents* web_contents) {
+    if (!web_contents)
+      return NULL;
+    BrowserViewRendererUserData* data =
+        reinterpret_cast<BrowserViewRendererUserData*>(
+            web_contents->GetUserData(kBrowserViewRendererUserDataKey));
+    return data ? data->bvr_ : NULL;
+  }
+
+ private:
+  BrowserViewRenderer* bvr_;
+};
+
+}  // namespace
+
+// static
+BrowserViewRenderer* BrowserViewRenderer::FromWebContents(
+    content::WebContents* web_contents) {
+  return BrowserViewRendererUserData::GetBrowserViewRenderer(web_contents);
+}
+
 // static
 BrowserViewRendererImpl* BrowserViewRendererImpl::Create(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper) {
   return new BrowserViewRendererImpl(client, java_helper);
 }
 
 BrowserViewRendererImpl::BrowserViewRendererImpl(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper)
     : client_(client),
       java_helper_(java_helper),
       view_renderer_host_(new ViewRendererHost(NULL, this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(compositor_(Compositor::Create(this))),
       view_clip_layer_(cc::Layer::create()),
       transform_layer_(cc::Layer::create()),
       scissor_clip_layer_(cc::Layer::create()),
+      view_attached_(false),
       view_visible_(false),
       compositor_visible_(false),
       is_composite_pending_(false),
       dpi_scale_(1.0f),
       page_scale_(1.0f),
       on_new_picture_mode_(kOnNewPictureDisabled),
       last_frame_context_(NULL),
       web_contents_(NULL),
       update_frame_info_callback_(
           base::Bind(&BrowserViewRendererImpl::OnFrameInfoUpdated,
@@ skipping 24 matching lines @@
 }
 
 void BrowserViewRendererImpl::SetContents(ContentViewCore* content_view_core) {
   if (web_contents_) {
     ContentViewCore* previous_content_view_core =
         ContentViewCore::FromWebContents(web_contents_);
     if (previous_content_view_core) {
       previous_content_view_core->RemoveFrameInfoCallback(
           update_frame_info_callback_);
     }
+    web_contents_->RemoveUserData(kBrowserViewRendererUserDataKey);
   }
 
   web_contents_ = content_view_core ?
                   content_view_core->GetWebContents() : NULL;
   view_renderer_host_->Observe(web_contents_);
 
   if (!content_view_core)
     return;
 
+  web_contents_->SetUserData(kBrowserViewRendererUserDataKey,
+                             new BrowserViewRendererUserData(this));
+
   content_view_core->AddFrameInfoCallback(update_frame_info_callback_);
   dpi_scale_ = content_view_core->GetDpiScale();
 
   view_clip_layer_->removeAllChildren();
   view_clip_layer_->addChild(content_view_core->GetLayer());
   Invalidate();
 }
 
 void BrowserViewRendererImpl::DrawGL(AwDrawGLInfo* draw_info) {
   TRACE_EVENT0("android_webview", "BrowserViewRendererImpl::DrawGL");
@@ skipping 330 matching lines @@
   view_visible_ = window_visible && view_visible;
   Invalidate();
 }
 
 void BrowserViewRendererImpl::OnSizeChanged(int width, int height) {
   view_size_ = gfx::Size(width, height);
   view_clip_layer_->setBounds(view_size_);
 }
 
 void BrowserViewRendererImpl::OnAttachedToWindow(int width, int height) {
+  view_attached_ = true;
   view_size_ = gfx::Size(width, height);
   view_clip_layer_->setBounds(view_size_);
 }
 
 void BrowserViewRendererImpl::OnDetachedFromWindow() {
+  view_attached_ = false;
   view_visible_ = false;
   SetCompositorVisibility(false);
 }
 
+bool BrowserViewRendererImpl::IsAttachedToWindow() {
+  return view_attached_;
+}
+
+bool BrowserViewRendererImpl::IsViewVisible() {
+  return view_visible_;
+}
+
+gfx::Rect BrowserViewRendererImpl::GetScreenRect() {
+  return gfx::Rect(client_->GetLocationOnScreen(), view_size_);
+}
+
 void BrowserViewRendererImpl::ScheduleComposite() {
   TRACE_EVENT0("android_webview", "BrowserViewRendererImpl::ScheduleComposite");
 
   if (is_composite_pending_)
     return;
 
   is_composite_pending_ = true;
   Invalidate();
 }
 
@@ skipping 81 matching lines @@
 
 void BrowserViewRendererImpl::OnFrameInfoUpdated(
     const gfx::SizeF& content_size,
     const gfx::Vector2dF& scroll_offset,
     float page_scale_factor) {
   page_scale_ = page_scale_factor;
   content_size_css_ = content_size;
 }
 
 }  // namespace android_webview