Index: Source/web/WebDOMMessageEvent.cpp |
diff --git a/Source/web/WebDOMMessageEvent.cpp b/Source/web/WebDOMMessageEvent.cpp |
index 53c928c53b99c2843e313a28f68111d9ec191698..ad76f7f0b5379341bc60a5d5d4e99dfb7eb91fc4 100644 |
--- a/Source/web/WebDOMMessageEvent.cpp |
+++ b/Source/web/WebDOMMessageEvent.cpp |
@@ -53,12 +53,8 @@ void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, |
if (sourceFrame) |
window = toWebFrameImpl(sourceFrame)->frame()->domWindow(); |
OwnPtr<MessagePortArray> ports; |
- if (!webChannels.isEmpty() && sourceFrame) { |
- OwnPtr<MessagePortChannelArray> channels = adoptPtr(new MessagePortChannelArray(webChannels.size())); |
- for (size_t i = 0; i < webChannels.size(); ++i) |
- (*channels)[i] = adoptPtr(webChannels[i]); |
- ports = MessagePort::entanglePorts(*window->document(), channels.release()); |
- } |
+ if (sourceFrame) |
+ ports = MessagePort::toMessagePortArray(window->document(), webChannels); |
unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messageData, origin, lastEventId, window, ports.release()); |
} |