summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/PopStateEvent.idl
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-05-11 18:35:50 +0100
committerBen Murdoch <benm@google.com>2010-05-14 10:23:05 +0100
commit21939df44de1705786c545cd1bf519d47250322d (patch)
treeef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/dom/PopStateEvent.idl
parent4ff1d8891d520763f17675827154340c7c740f90 (diff)
downloadexternal_webkit-21939df44de1705786c545cd1bf519d47250322d.zip
external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz
external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/dom/PopStateEvent.idl')
-rw-r--r--WebCore/dom/PopStateEvent.idl6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/dom/PopStateEvent.idl b/WebCore/dom/PopStateEvent.idl
index f9c9a71..28da9e6 100644
--- a/WebCore/dom/PopStateEvent.idl
+++ b/WebCore/dom/PopStateEvent.idl
@@ -27,11 +27,11 @@
module events {
interface PopStateEvent : Event {
- [Custom] void initPopStateEvent(in DOMString typeArg,
+ void initPopStateEvent(in DOMString typeArg,
in boolean canBubbleArg,
in boolean cancelableArg,
- in any stateArg);
-
+ in SerializedScriptValue stateArg);
+
readonly attribute [V8CustomGetter] any state;
};