ServiceWorker: Keep the worker alive until FetchEvent.waitUntil settles

third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp b/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
index 2843673ae53bcc4f9441c0d2e4efba4814b5abf6..64caca45e98034f83892df0cfa736fca17e1d82e 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
@@ -17,12 +17,12 @@ ForeignFetchEvent* ForeignFetchEvent::create()
 
 ForeignFetchEvent* ForeignFetchEvent::create(const AtomicString& type, const ForeignFetchEventInit& initializer)
 {
-    return new ForeignFetchEvent(type, initializer, nullptr);
+    return new ForeignFetchEvent(type, initializer, nullptr, nullptr);
 }
 
-ForeignFetchEvent* ForeignFetchEvent::create(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
+ForeignFetchEvent* ForeignFetchEvent::create(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* respondWithObserver, WaitUntilObserver* waitUntilObserver)
 {
-    return new ForeignFetchEvent(type, initializer, observer);
+    return new ForeignFetchEvent(type, initializer, respondWithObserver, waitUntilObserver);
 }
 
 Request* ForeignFetchEvent::request() const
@@ -51,9 +51,9 @@ ForeignFetchEvent::ForeignFetchEvent()
 {
 }
 
-ForeignFetchEvent::ForeignFetchEvent(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
-    : ExtendableEvent(type, initializer)
-    , m_observer(observer)
+ForeignFetchEvent::ForeignFetchEvent(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* respondWithObserver, WaitUntilObserver* waitUntilObserver)
+    : ExtendableEvent(type, initializer, waitUntilObserver)
+    , m_observer(respondWithObserver)
 {
     if (initializer.hasRequest())
         m_request = initializer.request();