Remove RefPtr<ScriptState> from FetchEvent

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/serviceworkers/FetchEvent.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "modules/fetch/BytesConsumerForDataConsumerHandle.h"
@@ skipping 53 matching lines @@
   return EventNames::FetchEvent;
 }
 
 FetchEvent::FetchEvent(ScriptState* scriptState,
                        const AtomicString& type,
                        const FetchEventInit& initializer,
                        RespondWithObserver* respondWithObserver,
                        WaitUntilObserver* waitUntilObserver,
                        bool navigationPreloadSent)
     : ExtendableEvent(type, initializer, waitUntilObserver),
-      m_scriptState(scriptState),
       m_observer(respondWithObserver),
       m_preloadResponseProperty(new PreloadResponseProperty(
           scriptState->getExecutionContext(),
           this,
           PreloadResponseProperty::PreloadResponse)) {
   if (!navigationPreloadSent) {
     // TODO(horo): This behavior is still under the spec discussion.
     // https://github.com/w3c/ServiceWorker/issues/920#issuecomment-255874864
     m_preloadResponseProperty->resolve(nullptr);
   }
@@ skipping 18 matching lines @@
     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.
   }
 }
 
 void FetchEvent::onNavigationPreloadResponse(
+    ScriptState* scriptState,
     std::unique_ptr<WebServiceWorkerResponse> response,
     std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) {
-  if (!m_scriptState->contextIsValid())
+  if (!scriptState->contextIsValid())
     return;
   DCHECK(m_preloadResponseProperty);
-  ScriptState::Scope scope(m_scriptState.get());
-  FetchResponseData* responseData =
-      FetchResponseData::createWithBuffer(new BodyStreamBuffer(
-          m_scriptState.get(), new BytesConsumerForDataConsumerHandle(
-                                   m_scriptState->getExecutionContext(),
-                                   std::move(dataConsumeHandle))));
+  ScriptState::Scope scope(scriptState);
+  FetchResponseData* responseData = FetchResponseData::createWithBuffer(
+      new BodyStreamBuffer(scriptState, new BytesConsumerForDataConsumerHandle(
+                                            scriptState->getExecutionContext(),
+                                            std::move(dataConsumeHandle))));
   responseData->setURL(response->url());
   responseData->setStatus(response->status());
   responseData->setStatusMessage(response->statusText());
   responseData->setResponseTime(response->responseTime());
   for (const auto& header : response->headers())
     responseData->headerList()->append(header.key, header.value);
   FetchResponseData* taintedResponse =
       responseData->createBasicFilteredResponse();
   m_preloadResponseProperty->resolve(
-      Response::create(m_scriptState->getExecutionContext(), taintedResponse));
+      Response::create(scriptState->getExecutionContext(), taintedResponse));
 }
 
 void FetchEvent::onNavigationPreloadError(
+    ScriptState* scriptState,
     std::unique_ptr<WebServiceWorkerError> error) {
-  if (!m_scriptState->contextIsValid())
+  if (!scriptState->contextIsValid())
     return;
   DCHECK(m_preloadResponseProperty);
   m_preloadResponseProperty->reject(
       ServiceWorkerError::take(nullptr, *error.get()));
 }
 
 DEFINE_TRACE(FetchEvent) {
   visitor->trace(m_observer);
   visitor->trace(m_request);
   visitor->trace(m_preloadResponseProperty);
   ExtendableEvent::trace(visitor);
 }
 
 }  // namespace blink