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

android_webview/native/aw_contents.cc

 // 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.
 
 #include "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/browser_view_renderer_impl.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/supports_user_data.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
@@ skipping 69 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh) return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents) return NULL;
   return FromWebContents(web_contents);
 }
 
+// static
+BrowserViewRenderer* BrowserViewRenderer::FromWebContents(

[joth, 2013/03/08 23:23:46]

this is really weird here!

BrowserViewRenderer is already holding a lot of responsibility for the draw path
so maybe confusing it to pull it into the dev tools flow too... but I see
there's nothing more convenient in browser/ for you to use at this point. 

AwContentsClientBridgeBase almost works, but isn't ideal as you don't really
want to pop out via the AwContentsClient.

If we keep with BrowserViewRenderer, I think the 'correct' solution is to have
it register itself with the WebContents::SetUserData() and then it can implement
its own FromWebContents() method. (And that would also help tackle the lifetime
ambiguity that currently exists between the two)

[mnaganov (inactive), 2013/03/11 14:39:20]

I would be using AwContents directly (because I'm viewing it as an extension of
WebContents), but this is prohibited by our architecture.

BrowserViewRenderer was the second natural choice, because it was only missing
the screen location data.

I did this hack as it required the least amount of lines. Switched to the
userdata approach.

+    content::WebContents* web_contents) {
+  AwContents* aw_contents = AwContents::FromWebContents(web_contents);
+  return aw_contents ? aw_contents->browser_view_renderer() : NULL;
+}
+
 AwContents::AwContents(JNIEnv* env,
                        jobject obj,
                        jobject web_contents_delegate,
                        jobject contents_client_bridge)
     : java_ref_(env, obj),
       web_contents_delegate_(
           new AwWebContentsDelegate(env, web_contents_delegate)),
       contents_client_bridge_(
           new AwContentsClientBridge(env, contents_client_bridge)),
       ALLOW_THIS_IN_INITIALIZER_LIST(browser_view_renderer_(
@@ skipping 542 matching lines @@
 }
 
 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) {
   web_contents_->FocusThroughTabTraversal(false);
 }
 
 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) {
   return reinterpret_cast<jint>(pending_contents_.release());
 }
 
+bool AwContents::isAttachedToViewHierarchy() {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (!obj.is_null())
+    return Java_AwContents_isAttachedToViewHierarchy(env, obj.obj());
+  return false;
+}
+
+gfx::Point AwContents::getLocationOnScreen() {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null()) return gfx::Point();
+  std::vector<int> location;
+  base::android::JavaIntArrayToIntVector(
+      env,
+      Java_AwContents_getLocationOnScreen(env, obj.obj()).obj(),
+      &location);
+  return gfx::Point(location[0], location[1]);
+}
+
 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
                                                        jobject obj) {
   return browser_view_renderer_->CapturePicture();
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled,
                                     jboolean invalidation_only) {
   BrowserViewRenderer::OnNewPictureMode mode =
       BrowserViewRenderer::kOnNewPictureDisabled;
   if (enabled) {
     mode = invalidation_only ?
         BrowserViewRenderer::kOnNewPictureInvalidationOnly :
         BrowserViewRenderer::kOnNewPictureEnabled;
   }
 
   browser_view_renderer_->EnableOnNewPicture(mode);
 }
 
 }  // namespace android_webview