Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: Source/web/WebDOMMessageEvent.cpp

Issue 24739002: Enable sending MessagePorts to a different renderer (Blink side) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Code review (jochen) Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | public/web/WebDOMMessageEvent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "core/dom/Document.h" 38 #include "core/dom/Document.h"
39 #include "core/events/MessageEvent.h" 39 #include "core/events/MessageEvent.h"
40 #include "core/dom/MessagePort.h" 40 #include "core/dom/MessagePort.h"
41 #include "core/frame/DOMWindow.h" 41 #include "core/frame/DOMWindow.h"
42 #include "public/platform/WebString.h" 42 #include "public/platform/WebString.h"
43 43
44 using namespace WebCore; 44 using namespace WebCore;
45 45
46 namespace WebKit { 46 namespace WebKit {
47 47
48 void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId) 48 void WebDOMMessageEvent::initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId, const WebMess agePortChannelArray& webChannels)
49 { 49 {
50 ASSERT(m_private.get()); 50 ASSERT(m_private.get());
51 ASSERT(isMessageEvent()); 51 ASSERT(isMessageEvent());
52 DOMWindow* window = 0; 52 DOMWindow* window = 0;
53 if (sourceFrame) 53 if (sourceFrame)
54 window = toWebFrameImpl(sourceFrame)->frame()->domWindow(); 54 window = toWebFrameImpl(sourceFrame)->frame()->domWindow();
55 OwnPtr<MessagePortArray> ports; 55 OwnPtr<MessagePortArray> ports;
56 if (!webChannels.isEmpty() && sourceFrame) {
57 OwnPtr<MessagePortChannelArray> channels = adoptPtr(new MessagePortChann elArray(webChannels.size()));
58 for (size_t i = 0; i < webChannels.size(); ++i)
59 (*channels)[i] = MessagePortChannel::create(webChannels[i]);
60 ports = MessagePort::entanglePorts(*window->document(), channels.release ());
61 }
56 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release()); 62 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release());
57 } 63 }
58 64
59 WebSerializedScriptValue WebDOMMessageEvent::data() const 65 WebSerializedScriptValue WebDOMMessageEvent::data() const
60 { 66 {
61 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->dataAsSerialize dScriptValue()); 67 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->dataAsSerialize dScriptValue());
62 } 68 }
63 69
64 WebString WebDOMMessageEvent::origin() const 70 WebString WebDOMMessageEvent::origin() const
65 { 71 {
66 return WebString(constUnwrap<MessageEvent>()->origin()); 72 return WebString(constUnwrap<MessageEvent>()->origin());
67 } 73 }
68 74
75 WebMessagePortChannelArray WebDOMMessageEvent::releaseChannels()
76 {
77 MessagePortChannelArray channels = constUnwrap<MessageEvent>()->channels();
78 WebMessagePortChannelArray webChannels(channels.size());
79 for (size_t i = 0; i < channels.size(); ++i)
80 webChannels[i] = channels[i]->webChannelRelease();
81 return webChannels;
82 }
83
69 } // namespace WebKit 84 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | public/web/WebDOMMessageEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698