Index: Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
diff --git a/Source/modules/indexeddb/IDBVersionChangeEvent.cpp b/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
index 798b9ac4c4085a7fa209cdd74681dca24540fe2a..db63a8b5a45350aa9828484cb9b66b73ca358989 100644 |
--- a/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
+++ b/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
@@ -31,12 +31,20 @@ |
namespace WebCore { |
-PassRefPtr<IDBVersionChangeEvent> IDBVersionChangeEvent::create(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBDataLoss dataLoss, const String& dataLossMessage) |
+ |
+IDBVersionChangeEventInit::IDBVersionChangeEventInit() |
+ : oldVersion(0) |
+ , newVersion(0) |
{ |
- return adoptRef(new IDBVersionChangeEvent(oldVersion, newVersion, eventType, dataLoss, dataLossMessage)); |
} |
-IDBVersionChangeEvent::IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBDataLoss dataLoss, const String& dataLossMessage) |
+IDBVersionChangeEvent::IDBVersionChangeEvent() |
+ : m_dataLoss(blink::WebIDBDataLossNone) |
+{ |
+ ScriptWrappable::init(this); |
+} |
+ |
+IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& eventType, PassRefPtr<SerializedScriptValue> oldVersion, PassRefPtr<SerializedScriptValue> newVersion, blink::WebIDBDataLoss dataLoss, const String& dataLossMessage) |
: Event(eventType, false /*canBubble*/, false /*cancelable*/) |
, m_oldVersion(oldVersion) |
, m_newVersion(newVersion) |
@@ -46,20 +54,13 @@ IDBVersionChangeEvent::IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, Pass |
ScriptWrappable::init(this); |
} |
-IDBVersionChangeEvent::~IDBVersionChangeEvent() |
-{ |
-} |
- |
-ScriptValue IDBVersionChangeEvent::oldVersion(ExecutionContext* context) const |
-{ |
- DOMRequestState requestState(context); |
- return idbAnyToScriptValue(&requestState, m_oldVersion); |
-} |
- |
-ScriptValue IDBVersionChangeEvent::newVersion(ExecutionContext* context) const |
+IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& eventType, const IDBVersionChangeEventInit& initializer) |
+ : Event(eventType, false /*canBubble*/, false /*cancelable*/) |
+ , m_oldVersion(SerializedScriptValue::numberValue(initializer.oldVersion)) |
+ , m_newVersion(SerializedScriptValue::numberValue(initializer.newVersion)) |
+ , m_dataLoss(blink::WebIDBDataLossNone) |
{ |
- DOMRequestState requestState(context); |
- return idbAnyToScriptValue(&requestState, m_newVersion); |
+ ScriptWrappable::init(this); |
} |
const AtomicString& IDBVersionChangeEvent::dataLoss() const |