| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| index 3ee10deafe17e003768787f98b007027fe113eda..f68752dbce37b05b58e38cee13c2d2d68bd25827 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -1790,9 +1790,15 @@ public class AwContents implements SmartClipProvider {
|
| * message ports to pass.
|
| */
|
| public void postMessageToFrame(String frameName, String message,
|
| - String sourceOrigin, String targetOrigin, int[] msgPorts) {
|
| + String sourceOrigin, String targetOrigin, MessagePort[] msgPorts) {
|
| + int[] portIds = null;
|
| + if (msgPorts != null) {
|
| + portIds = new int[msgPorts.length];
|
| + for (int i = 0; i < msgPorts.length; i++)
|
| + portIds[i] = msgPorts[i].portId();
|
| + }
|
| nativePostMessageToFrame(mNativeAwContents, frameName, message, sourceOrigin,
|
| - targetOrigin, msgPorts);
|
| + targetOrigin, portIds);
|
| }
|
|
|
| /**
|
| @@ -1801,10 +1807,11 @@ public class AwContents implements SmartClipProvider {
|
| * @param callback The message channel created.
|
| */
|
| public void createMessageChannel(ValueCallback<MessageChannel> callback) {
|
| + // Make sure the message port service is created.
|
| + mBrowserContext.createMessagePortService();
|
| nativeCreateMessageChannel(mNativeAwContents, callback);
|
| }
|
|
|
| -
|
| //--------------------------------------------------------------------------------------------
|
| // View and ViewGroup method implementations
|
| //--------------------------------------------------------------------------------------------
|
| @@ -2217,12 +2224,6 @@ public class AwContents implements SmartClipProvider {
|
| }
|
| }
|
|
|
| - @CalledByNative
|
| - private static void onMessageChannelCreated(int portId1, int portId2,
|
| - ValueCallback<MessageChannel> callback) {
|
| - callback.onReceiveValue(new MessageChannel(portId1, portId2));
|
| - }
|
| -
|
| // -------------------------------------------------------------------------------------------
|
| // Helper methods
|
| // -------------------------------------------------------------------------------------------
|
|
|