Enable posting a message from JS to Android webview.

android_webview/native/aw_contents.cc

 // Copyright 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 <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
 #include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/native/aw_autofill_client.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_message_port_service_impl.h"
 #include "android_webview/native/aw_pdf_exporter.h"
 #include "android_webview/native/aw_picture.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "android_webview/native/permission/simple_permission_request.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/android/jni_android.h"
@@ skipping 92 matching lines @@
 
 base::subtle::Atomic32 g_instance_count = 0;
 
 void OnIoThreadClientReady(content::RenderFrameHost* rfh) {
   int render_process_id = rfh->GetProcess()->GetID();
   int render_frame_id = rfh->GetRoutingID();
   AwResourceDispatcherHostDelegate::OnIoThreadClientReady(
       render_process_id, render_frame_id);
 }
 
-void OnMessageChannelCreated(ScopedJavaGlobalRef<jobject>* callback,
-                             int* port1,
-                             int* port2) {
-  JNIEnv* env = AttachCurrentThread();
-  Java_AwContents_onMessageChannelCreated(env, *port1, *port2,
-    callback->obj());
-}
-
 void PostMessageToFrameOnIOThread(WebContents* web_contents,
                                   base::string16* source_origin,
                                   base::string16* target_origin,
                                   base::string16* data,
                                   std::vector<int>* ports) {
   content::MessagePortProvider::PostMessageToFrame(web_contents,
       *source_origin, *target_origin, *data, *ports);
 }
 
 }  // namespace
@@ skipping 945 matching lines @@
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&PostMessageToFrameOnIOThread,
                  web_contents_.get(),
                  base::Owned(j_source_origin),
                  base::Owned(j_target_origin),
                  base::Owned(j_message),
                  base::Owned(j_ports)));
 }
 
+scoped_refptr<AwMessagePortMessageFilter>
+AwContents::GetMessagePortMessageFilter() {
+  // Create a message port message filter if necessary
+  if (message_port_message_filter_.get() == nullptr) {
+    message_port_message_filter_ =
+        new AwMessagePortMessageFilter(
+            web_contents_->GetMainFrame()->GetRoutingID());
+    web_contents_->GetRenderProcessHost()->AddFilter(
+        message_port_message_filter_.get());
+  }
+  return message_port_message_filter_;
+}
+
 void AwContents::CreateMessageChannel(JNIEnv* env, jobject obj,
     jobject callback) {
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
 
-  int* port1 = new int;
-  int* port2 = new int;
+  int* portId1 = new int;
+  int* portId2 = new int;
   BrowserThread::PostTaskAndReply(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&content::MessagePortProvider::CreateMessageChannel,
-                 web_contents_.get(),
-                 port1,
-                 port2),
-      base::Bind(&OnMessageChannelCreated,
+                 GetMessagePortMessageFilter(),
+                 portId1,
+                 portId2),
+      base::Bind(&AwMessagePortServiceImpl::OnMessageChannelCreated,
+                 base::Unretained(AwMessagePortServiceImpl::GetInstance()),
+                 GetMessagePortMessageFilter(),
                  base::Owned(j_callback),
-                 base::Owned(port1),
-                 base::Owned(port2)));
+                 base::Owned(portId1),
+                 base::Owned(portId2)));
 }
 
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview