Title: [102496] trunk/Source/WebKit/chromium
- Revision
- 102496
- Author
- commit-qu...@webkit.org
- Date
- 2011-12-09 17:18:20 -0800 (Fri, 09 Dec 2011)
Log Message
[chromium] add accessors to WebDOMMessageEvent
https://bugs.webkit.org/show_bug.cgi?id=73346
Patch by Karl Koscher <super...@chromium.org> on 2011-12-09
Reviewed by Darin Fisher.
* public/WebDOMMessageEvent.h:
* src/WebDOMMessageEvent.cpp:
(WebKit::WebDOMMessageEvent::data):
(WebKit::WebDOMMessageEvent::origin):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102495 => 102496)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-10 01:09:09 UTC (rev 102495)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-10 01:18:20 UTC (rev 102496)
@@ -1,5 +1,17 @@
2011-12-09 Karl Koscher <super...@chromium.org>
+ [chromium] add accessors to WebDOMMessageEvent
+ https://bugs.webkit.org/show_bug.cgi?id=73346
+
+ Reviewed by Darin Fisher.
+
+ * public/WebDOMMessageEvent.h:
+ * src/WebDOMMessageEvent.cpp:
+ (WebKit::WebDOMMessageEvent::data):
+ (WebKit::WebDOMMessageEvent::origin):
+
+2011-12-09 Karl Koscher <super...@chromium.org>
+
[chromium] add event methods to WebFrame
https://bugs.webkit.org/show_bug.cgi?id=73259
Modified: trunk/Source/WebKit/chromium/public/WebDOMMessageEvent.h (102495 => 102496)
--- trunk/Source/WebKit/chromium/public/WebDOMMessageEvent.h 2011-12-10 01:09:09 UTC (rev 102495)
+++ trunk/Source/WebKit/chromium/public/WebDOMMessageEvent.h 2011-12-10 01:18:20 UTC (rev 102496)
@@ -32,6 +32,7 @@
#include "WebDOMEvent.h"
#include "WebMessagePortChannel.h"
+#include "platform/WebSerializedScriptValue.h"
#if WEBKIT_IMPLEMENTATION
namespace WebCore { class Event; }
@@ -41,11 +42,13 @@
class WebFrame;
class WebString;
-class WebSerializedScriptValue;
class WebDOMMessageEvent : public WebDOMEvent {
public:
WEBKIT_EXPORT void initMessageEvent(const WebString& type, bool canBubble, bool cancelable, const WebSerializedScriptValue& messageData, const WebString& origin, const WebFrame* sourceFrame, const WebString& lastEventId);
+
+ WEBKIT_EXPORT WebSerializedScriptValue data() const;
+ WEBKIT_EXPORT WebString origin() const;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebDOMMessageEvent.cpp (102495 => 102496)
--- trunk/Source/WebKit/chromium/src/WebDOMMessageEvent.cpp 2011-12-10 01:09:09 UTC (rev 102495)
+++ trunk/Source/WebKit/chromium/src/WebDOMMessageEvent.cpp 2011-12-10 01:18:20 UTC (rev 102496)
@@ -60,4 +60,14 @@
unwrap<MessageEvent>()->initMessageEvent(type, canBubble, cancelable, messageData, origin, lastEventId, window, ports.release());
}
+WebSerializedScriptValue WebDOMMessageEvent::data() const
+{
+ return WebSerializedScriptValue(constUnwrap<MessageEvent>()->data());
+}
+
+WebString WebDOMMessageEvent::origin() const
+{
+ return WebString(constUnwrap<MessageEvent>()->origin());
+}
+
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
