Hold messages in message port service when a message port is

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 132 matching lines @@
     int message_port_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AwMessagePortServiceImpl::PostClosePortMessage,
                  base::Unretained(this),
                  message_port_id));
 }
 
+void AwMessagePortServiceImpl::ReleaseMessages(JNIEnv* env, jobject obj,
+    int message_port_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&MessagePortProvider::ReleaseMessages, message_port_id));
+}
+
 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,
@@ skipping 11 matching lines @@
 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);
+  MessagePortProvider::HoldMessages(*portId1);
+  MessagePortProvider::HoldMessages(*portId2);
   AddPort(*portId1, filter.get());
   AddPort(*portId2, filter.get());
 }
 
 void AwMessagePortServiceImpl::OnMessageChannelCreated(
     ScopedJavaGlobalRef<jobjectArray>* ports,
     int* port1,
     int* port2) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
@@ skipping 19 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