| OLD | NEW |
| 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 13 matching lines...) Expand all Loading... |
| 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 "WebDOMMessageEvent.h" | 32 #include "WebDOMMessageEvent.h" |
| 33 | 33 |
| 34 #include "SerializedScriptValue.h" | |
| 35 #include "WebFrame.h" | 34 #include "WebFrame.h" |
| 36 #include "WebFrameImpl.h" | 35 #include "WebFrameImpl.h" |
| 37 #include "WebSerializedScriptValue.h" | 36 #include "WebSerializedScriptValue.h" |
| 37 #include "bindings/v8/SerializedScriptValue.h" |
| 38 #include "core/dom/Document.h" | 38 #include "core/dom/Document.h" |
| 39 #include "core/dom/MessageEvent.h" | 39 #include "core/dom/MessageEvent.h" |
| 40 #include "core/dom/MessagePort.h" | 40 #include "core/dom/MessagePort.h" |
| 41 #include "core/dom/default/chromium/PlatformMessagePortChannelChromium.h" | 41 #include "core/dom/default/chromium/PlatformMessagePortChannelChromium.h" |
| 42 #include "core/page/DOMWindow.h" | 42 #include "core/page/DOMWindow.h" |
| 43 #include <public/WebString.h> | 43 #include <public/WebString.h> |
| 44 | 44 |
| 45 using namespace WebCore; | 45 using namespace WebCore; |
| 46 | 46 |
| 47 namespace WebKit { | 47 namespace WebKit { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 61 { | 61 { |
| 62 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->data()); | 62 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->data()); |
| 63 } | 63 } |
| 64 | 64 |
| 65 WebString WebDOMMessageEvent::origin() const | 65 WebString WebDOMMessageEvent::origin() const |
| 66 { | 66 { |
| 67 return WebString(constUnwrap<MessageEvent>()->origin()); | 67 return WebString(constUnwrap<MessageEvent>()->origin()); |
| 68 } | 68 } |
| 69 | 69 |
| 70 } // namespace WebKit | 70 } // namespace WebKit |
| OLD | NEW |