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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 ASSERT(isMessageEvent()); | 52 ASSERT(isMessageEvent()); |
53 DOMWindow* window = 0; | 53 DOMWindow* window = 0; |
54 if (sourceFrame) | 54 if (sourceFrame) |
55 window = static_cast<const WebFrameImpl*>(sourceFrame)->frame()->documen t()->domWindow(); | 55 window = static_cast<const WebFrameImpl*>(sourceFrame)->frame()->documen t()->domWindow(); |
56 OwnPtr<MessagePortArray> ports; | 56 OwnPtr<MessagePortArray> ports; |
57 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release()); | 57 unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messag eData, origin, lastEventId, window, ports.release()); |
58 } | 58 } |
59 | 59 |
60 WebSerializedScriptValue WebDOMMessageEvent::data() const | 60 WebSerializedScriptValue WebDOMMessageEvent::data() const |
61 { | 61 { |
62 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->data()); | 62 return WebSerializedScriptValue(constUnwrap<MessageEvent>()->dataAsSerialize dScriptValue()); |
eseidel
2013/04/29 21:00:35
I don't understand this change.
adamk
2013/04/29 21:09:33
I don't fully understand it either, but the old da
| |
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 |