OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "PlatformMessagePortChannelChromium.h" | 32 #include "core/dom/default/chromium/PlatformMessagePortChannelChromium.h" |
33 | 33 |
34 #include "MessagePort.h" | |
35 #include "ScriptExecutionContext.h" | |
36 #include "SerializedScriptValue.h" | 34 #include "SerializedScriptValue.h" |
| 35 #include "core/dom/MessagePort.h" |
| 36 #include "core/dom/ScriptExecutionContext.h" |
37 | 37 |
38 #include <public/Platform.h> | 38 #include <public/Platform.h> |
39 #include <public/WebMessagePortChannel.h> | 39 #include <public/WebMessagePortChannel.h> |
40 #include <public/WebString.h> | 40 #include <public/WebString.h> |
41 | 41 |
42 namespace WebCore { | 42 namespace WebCore { |
43 | 43 |
44 PassOwnPtr<MessagePortChannel> MessagePortChannel::create(PassRefPtr<PlatformMes
sagePortChannel> channel) | 44 PassOwnPtr<MessagePortChannel> MessagePortChannel::create(PassRefPtr<PlatformMes
sagePortChannel> channel) |
45 { | 45 { |
46 return adoptPtr(new MessagePortChannel(channel)); | 46 return adoptPtr(new MessagePortChannel(channel)); |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 } | 243 } |
244 | 244 |
245 WebKit::WebMessagePortChannel* PlatformMessagePortChannel::webChannelRelease() | 245 WebKit::WebMessagePortChannel* PlatformMessagePortChannel::webChannelRelease() |
246 { | 246 { |
247 WebKit::WebMessagePortChannel* rv = m_webChannel; | 247 WebKit::WebMessagePortChannel* rv = m_webChannel; |
248 m_webChannel = 0; | 248 m_webChannel = 0; |
249 return rv; | 249 return rv; |
250 } | 250 } |
251 | 251 |
252 } // namespace WebCore | 252 } // namespace WebCore |
OLD | NEW |