Index: Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
diff --git a/Source/modules/indexeddb/IDBVersionChangeEvent.cpp b/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
index e489f32f0fbf7a26ffc34843380ddf3d01685e22..710e8fe22b0e96cb831622639e1874139445c923 100644 |
--- a/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
+++ b/Source/modules/indexeddb/IDBVersionChangeEvent.cpp |
@@ -31,12 +31,19 @@ |
namespace WebCore { |
-PassRefPtrWillBeRawPtr<IDBVersionChangeEvent> IDBVersionChangeEvent::create(PassRefPtr<IDBAny> oldVersion, PassRefPtr<IDBAny> newVersion, const AtomicString& eventType, blink::WebIDBDataLoss dataLoss, const String& dataLossMessage) |
+ |
+IDBVersionChangeEventInit::IDBVersionChangeEventInit() |
+ : oldVersion(0) |
{ |
- return adoptRefWillBeRefCountedGarbageCollected(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, unsigned long long oldVersion, const Nullable<unsigned long long>& newVersion, blink::WebIDBDataLoss dataLoss, const String& dataLossMessage) |
: Event(eventType, false /*canBubble*/, false /*cancelable*/) |
, m_oldVersion(oldVersion) |
, m_newVersion(newVersion) |
@@ -46,20 +53,19 @@ IDBVersionChangeEvent::IDBVersionChangeEvent(PassRefPtr<IDBAny> oldVersion, Pass |
ScriptWrappable::init(this); |
} |
-IDBVersionChangeEvent::~IDBVersionChangeEvent() |
-{ |
-} |
- |
-ScriptValue IDBVersionChangeEvent::oldVersion(ExecutionContext* context) const |
+IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& eventType, const IDBVersionChangeEventInit& initializer) |
+ : Event(eventType, false /*canBubble*/, false /*cancelable*/) |
+ , m_oldVersion(initializer.oldVersion) |
+ , m_newVersion(initializer.newVersion) |
+ , m_dataLoss(blink::WebIDBDataLossNone) |
{ |
- DOMRequestState requestState(context); |
- return idbAnyToScriptValue(&requestState, m_oldVersion); |
+ ScriptWrappable::init(this); |
} |
-ScriptValue IDBVersionChangeEvent::newVersion(ExecutionContext* context) const |
+unsigned long long IDBVersionChangeEvent::newVersion(bool& isNull) const |
{ |
- DOMRequestState requestState(context); |
- return idbAnyToScriptValue(&requestState, m_newVersion); |
+ isNull = m_newVersion.isNull(); |
+ return isNull ? 0 : m_newVersion.get(); |
} |
const AtomicString& IDBVersionChangeEvent::dataLoss() const |