Index: Source/modules/serviceworkers/ExtendableEvent.cpp |
diff --git a/Source/modules/serviceworkers/ExtendableEvent.cpp b/Source/modules/serviceworkers/ExtendableEvent.cpp |
index 0d4db1534c5ebbde7ed1e96cd282ff5178eed7df..05e846c7f360e21d56393c10ef167d126b3ec4f9 100644 |
--- a/Source/modules/serviceworkers/ExtendableEvent.cpp |
+++ b/Source/modules/serviceworkers/ExtendableEvent.cpp |
@@ -41,7 +41,12 @@ PassRefPtrWillBeRawPtr<ExtendableEvent> ExtendableEvent::create() |
return adoptRefWillBeNoop(new ExtendableEvent()); |
} |
-PassRefPtrWillBeRawPtr<ExtendableEvent> ExtendableEvent::create(const AtomicString& type, const EventInit& eventInit, WaitUntilObserver* observer) |
+PassRefPtrWillBeRawPtr<ExtendableEvent> ExtendableEvent::create(const AtomicString& type, const ExtendableEventInit& eventInit) |
+{ |
+ return adoptRefWillBeNoop(new ExtendableEvent(type, eventInit)); |
+} |
+ |
+PassRefPtrWillBeRawPtr<ExtendableEvent> ExtendableEvent::create(const AtomicString& type, const ExtendableEventInit& eventInit, WaitUntilObserver* observer) |
{ |
return adoptRefWillBeNoop(new ExtendableEvent(type, eventInit, observer)); |
} |
@@ -52,14 +57,20 @@ ExtendableEvent::~ExtendableEvent() |
void ExtendableEvent::waitUntil(ScriptState* scriptState, const ScriptValue& value) |
{ |
- m_observer->waitUntil(scriptState, value); |
+ if (m_observer) |
+ m_observer->waitUntil(scriptState, value); |
} |
ExtendableEvent::ExtendableEvent() |
{ |
} |
-ExtendableEvent::ExtendableEvent(const AtomicString& type, const EventInit& initializer, WaitUntilObserver* observer) |
+ExtendableEvent::ExtendableEvent(const AtomicString& type, const ExtendableEventInit& initializer) |
+ : Event(type, initializer) |
+{ |
+} |
+ |
+ExtendableEvent::ExtendableEvent(const AtomicString& type, const ExtendableEventInit& initializer, WaitUntilObserver* observer) |
: Event(type, initializer) |
, m_observer(observer) |
{ |