Implement the close() API for Message ports

android_webview/native/aw_message_port_service_impl.cc

 // Copyright 2015 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_message_port_service_impl.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_message_port_message_filter.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_array.h"
@@ skipping 114 matching lines @@
   if (sent_ports != nullptr)
     base::android::JavaIntArrayToIntVector(env, sent_ports, j_sent_ports);
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AwMessagePortServiceImpl::PostAppToWebMessageOnIOThread,
                  base::Unretained(this),
                  sender_id,
                  base::Owned(j_message),
-                 base::Owned(j_sent_ports)));
+                 base::Owned(j_sent_ports),
+                 false));
+}
+
+// The message port service cannot immediately close the port, because
+// it is possible that messages are still queued in the renderer process
+// waiting for a conversion. Instead, it sends a special message with
+// a flag which indicates that this message port should be closed.
+void AwMessagePortServiceImpl::ClosePort(JNIEnv* env, jobject obj,
+    int message_port_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  base::string16* j_message = new base::string16;
+  std::vector<int>* j_sent_ports = new std::vector<int>;
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&AwMessagePortServiceImpl::PostAppToWebMessageOnIOThread,
+                 base::Unretained(this),
+                 message_port_id,
+                 base::Owned(j_message),
+                 base::Owned(j_sent_ports),
+                 true /* close the port */));
 }
 
 void AwMessagePortServiceImpl::RemoveSentPorts(
     const std::vector<int>& sent_ports) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Remove the filters that are associated with the transferred ports
   for (const auto& iter : sent_ports)
     ports_.erase(iter);
 }
 
 void AwMessagePortServiceImpl::PostAppToWebMessageOnIOThread(
     int sender_id,
     base::string16* message,
-    std::vector<int>* sent_ports) {
+    std::vector<int>* sent_ports,
+    bool close_port) {
   RemoveSentPorts(*sent_ports);
-  ports_[sender_id]->SendAppToWebMessage(sender_id, *message, *sent_ports);
+  if (!ports_[sender_id]) {
+    NOTREACHED();
+  }
+  ports_[sender_id]->SendAppToWebMessage(sender_id, *message, *sent_ports,
+      close_port);
 }
 
+void AwMessagePortServiceImpl::CleanupPort(int message_port_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  ports_.erase(message_port_id);
+}
 
 void AwMessagePortServiceImpl::CreateMessageChannelOnIOThread(
     scoped_refptr<AwMessagePortMessageFilter> filter,
     int* portId1,
     int* portId2) {
   MessagePortProvider::CreateMessageChannel(filter.get(), portId1, portId2);
   AddPort(*portId1, filter.get());
   AddPort(*portId2, filter.get());
 }
 
@@ skipping 25 matching lines @@
 }
 
 // static
 jlong InitAwMessagePortService(JNIEnv* env, jobject obj) {
   AwMessagePortServiceImpl* service = AwMessagePortServiceImpl::GetInstance();
   service->Init(env, obj);
   return reinterpret_cast<intptr_t>(service);
 }
 
 }  // namespace android_webview