Implement the close() API for Message ports

android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java

 // 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.
 
 package org.chromium.android_webview;
 
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.SparseArray;
@@ skipping 105 matching lines @@
     }
 
     public void addObserver(MessageChannelObserver observer) {
         mObserverList.addObserver(observer);
     }
 
     public void removeObserver(MessageChannelObserver observer) {
         mObserverList.removeObserver(observer);
     }
 
+    public void closePort(int messagePortId) {
+        mPortStorage.put(messagePortId, null);

[hush (inactive), 2015/02/25 19:44:27]

what's different between this and mPortStorage.remove(messagePortId)?

[sgurun-gerrit only, 2015/02/25 21:38:53]

good catch.

+        if (mNativeMessagePortService == 0) return;
+        nativeClosePort(mNativeMessagePortService, messagePortId);
+    }
+
     public void postMessage(int senderId, String message, int[] sentPorts) {
         // verify that webview still owns the port (not transferred)
         if (mPortStorage.get(senderId) == null) {
             throw new IllegalStateException("Cannot post to unknown port " + senderId);
         }
-        removeSentPorts(sentPorts);

[hush (inactive), 2015/02/25 19:44:27]

why is this removed?

[sgurun-gerrit only, 2015/02/25 21:38:53]

this is actually a bug. The ports are removed in PostMessageSender (see
removeSentPorts there)

         if (mNativeMessagePortService == 0) return;
         nativePostAppToWebMessage(mNativeMessagePortService, senderId, message, sentPorts);
     }
 
     public void removeSentPorts(int[] sentPorts) {
         // verify that webview owns all the ports that are transferred
         if (sentPorts != null) {
             for (int port : sentPorts) {
                 MessagePort p = mPortStorage.get(port);
                 if (p == null) {
@@ skipping 41 matching lines @@
     }
 
     @CalledByNative
     private void unregisterNativeAwMessagePortService() {
         mNativeMessagePortService = 0;
     }
 
     private native long nativeInitAwMessagePortService();
     private native void nativePostAppToWebMessage(long nativeAwMessagePortServiceImpl,
             int senderId, String message, int[] portIds);
+    private native void nativeClosePort(long nativeAwMessagePortServiceImpl,
+            int messagePortId);
 }