[Fetch API] Request's JS wrapper should be kept alive in FetchEvent

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..fb4a559db0e2e8196af9965e7f22f82b996e22be 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ForeignFetchEvent.cpp
@@ -4,6 +4,8 @@
 
 #include "modules/serviceworkers/ForeignFetchEvent.h"
 
+#include "bindings/core/v8/ToV8.h"
+#include "bindings/core/v8/V8HiddenValue.h"
 #include "modules/fetch/Request.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
 #include "wtf/RefPtr.h"
@@ -15,14 +17,14 @@ ForeignFetchEvent* ForeignFetchEvent::create()
     return new ForeignFetchEvent();
 }
 
-ForeignFetchEvent* ForeignFetchEvent::create(const AtomicString& type, const ForeignFetchEventInit& initializer)
+ForeignFetchEvent* ForeignFetchEvent::create(ScriptState* scriptState, const AtomicString& type, const ForeignFetchEventInit& initializer)
 {
-    return new ForeignFetchEvent(type, initializer, nullptr);
+    return new ForeignFetchEvent(scriptState, type, initializer, nullptr);
 }
 
-ForeignFetchEvent* ForeignFetchEvent::create(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
+ForeignFetchEvent* ForeignFetchEvent::create(ScriptState* scriptState, const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
 {
-    return new ForeignFetchEvent(type, initializer, observer);
+    return new ForeignFetchEvent(scriptState, type, initializer, observer);
 }
 
 Request* ForeignFetchEvent::request() const
@@ -51,14 +53,33 @@ ForeignFetchEvent::ForeignFetchEvent()
 {
 }
 
-ForeignFetchEvent::ForeignFetchEvent(const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
+ForeignFetchEvent::ForeignFetchEvent(ScriptState* scriptState, const AtomicString& type, const ForeignFetchEventInit& initializer, ForeignFetchRespondWithObserver* observer)
     : ExtendableEvent(type, initializer)
     , m_observer(observer)
 {
-    if (initializer.hasRequest())
-        m_request = initializer.request();
     if (initializer.hasOrigin())
         m_origin = initializer.origin();
+    if (initializer.hasRequest()) {
+        m_request = initializer.request();
+        ScriptState::Scope scope(scriptState);
+        m_request = initializer.request();
+        v8::Local<v8::Value> request = toV8(m_request, scriptState);
+        v8::Local<v8::Value> event = toV8(this, scriptState);
+        if (event.IsEmpty()) {
+            // |toV8| can return an empty handle when the worker is terminating.
+            // We don't want the renderer to crash in such cases.
+            // TODO(yhirano): Replace this branch with an assertion when the
+            // graceful shutdown mechanism is introduced.
+            return;
+        }
+        DCHECK(event->IsObject());
+        // Sets a hidden value in order to teach V8 the dependency from
+        // the event to the request.
+        V8HiddenValue::setHiddenValue(scriptState, event.As<v8::Object>(), V8HiddenValue::requestInFetchEvent(scriptState->isolate()), request);
+        // From the same reason as above, setHiddenValue can return false.
+        // TODO(yhirano): Add an assertion that it returns true once the
+        // graceful shutdown mechanism is introduced.
+    }
 }
 
 DEFINE_TRACE(ForeignFetchEvent)