Upstream version 6.34.113.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / android / xwalk_contents_client_bridge_base.cc

diff --git a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.cc b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.cc
index 89a8d24..4481431 100644 (file)
--- a/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.cc
+++ b/src/xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.cc
@@ -6,6 +6,7 @@
 #include "xwalk/runtime/browser/android/xwalk_contents_client_bridge_base.h"
 
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ -55,7 +56,7 @@ XWalkContentsClientBridgeBase* XWalkContentsClientBridgeBase::FromWebContents(
 }
 
 // static
-XWalkContentsClientBridgeBase* XWalkContentsClientBridgeBase::FromID(
+XWalkContentsClientBridgeBase* XWalkContentsClientBridgeBase::FromRenderViewID(
     int render_process_id,
     int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -67,6 +68,19 @@ XWalkContentsClientBridgeBase* XWalkContentsClientBridgeBase::FromID(
   return UserData::GetContents(web_contents);
 }
 
+// static
+XWalkContentsClientBridgeBase* XWalkContentsClientBridgeBase::FromRenderFrameID(
+    int render_process_id,
+    int render_frame_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!rfh) return NULL;
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(rfh);
+  return UserData::GetContents(web_contents);
+}
+
 XWalkContentsClientBridgeBase::~XWalkContentsClientBridgeBase() {
 }