Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/Source/WebCore/dom/CustomEvent.cpp b/Source/WebCore/dom/CustomEvent.cpp
index 21ae22591..9ca5a142d 100644
--- a/Source/WebCore/dom/CustomEvent.cpp
+++ b/Source/WebCore/dom/CustomEvent.cpp
@@ -34,7 +34,6 @@ CustomEventInit::CustomEventInit()
 {
 }
 
-
 CustomEvent::CustomEvent()
 {
 }
@@ -51,6 +50,7 @@ CustomEvent::~CustomEvent()
 
 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, const ScriptValue& detail)
 {
+    ASSERT(!m_serializedScriptValue.get());
     if (dispatched())
         return;
 
@@ -59,6 +59,19 @@ void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool
     m_detail = detail;
 }
 
+#if USE(V8)
+void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> serializedScriptValue)
+{
+    ASSERT(m_detail.hasNoValue());
+    if (dispatched())
+        return;
+
+    initEvent(type, canBubble, cancelable);
+
+    m_serializedScriptValue = serializedScriptValue;
+}
+#endif // USE(V8)
+
 const AtomicString& CustomEvent::interfaceName() const
 {
     return eventNames().interfaceForCustomEvent;