Add Java wrapper for RenderFrameHost

content/browser/web_contents/web_contents_android.cc

 // Copyright 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 "content/browser/web_contents/web_contents_android.h"
 
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 214 matching lines @@
     return;
 
   WebContents* web_contents = web_contents_android->web_contents();
   if (!web_contents)
     return;
 
   delete web_contents;
 }
 
 // static
+ScopedJavaLocalRef<jobject> FromRenderFrameHost(

[boliu, 2017/02/16 01:00:58]

this is a really convoluted way to implement this..

maybe we should have a RenderFrameHostDelegate (which I guess at this point is
empty) in java, then it has to be passed to RFH constructor, and java
WebContents can just cast it back

[rwlbuis, 2017/03/01 21:53:57]

Ok I added RenderFrameHostDelegate.

+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jobject>& jrender_frame_host_android) {
+  RenderFrameHost* rfh =
+      RenderFrameHost::FromJavaRenderFrameHost(jrender_frame_host_android);
+  if (!rfh)
+    return ScopedJavaLocalRef<jobject>();
+
+  WebContents* webContents = WebContents::FromRenderFrameHost(rfh);
+  if (!webContents)
+    return ScopedJavaLocalRef<jobject>();
+
+  return webContents->GetJavaWebContents();
+}
+
+// static
 ScopedJavaLocalRef<jobject> FromNativePtr(JNIEnv* env,
                                           const JavaParamRef<jclass>& clazz,
                                           jlong web_contents_ptr) {
   WebContentsAndroid* web_contents_android =
       reinterpret_cast<WebContentsAndroid*>(web_contents_ptr);
 
   if (!web_contents_android)
     return ScopedJavaLocalRef<jobject>();
 
   // Check to make sure this object hasn't been destroyed.
@@ skipping 33 matching lines @@
       g_allocated_web_contents_androids.Get().end());
   g_allocated_web_contents_androids.Get().erase(this);
   Java_WebContentsImpl_clearNativePtr(AttachCurrentThread(), obj_);
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 WebContentsAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(obj_);
 }
 
+ScopedJavaLocalRef<jobject> WebContentsAndroid::GetMainFrame(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) const {
+  return web_contents_->GetMainFrame()->GetJavaRenderFrameHost();
+}
+
 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetTitle(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) const {
   return base::android::ConvertUTF16ToJavaString(env,
                                                  web_contents_->GetTitle());
 }
 
 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetVisibleURL(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) const {
@@ skipping 465 matching lines @@
       env, obj, callback, id, http_status_code, jurl, jbitmaps, jsizes);
 }
 
 void WebContentsAndroid::SetMediaSession(
     const ScopedJavaLocalRef<jobject>& j_media_session) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_WebContentsImpl_setMediaSession(env, obj_, j_media_session);
 }
 
 }  // namespace content