Rename navigationPreload of FetchEvent to preloadResponse

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 38 matching lines @@
 }
 
 void FetchEvent::respondWith(ScriptState* scriptState,
                              ScriptPromise scriptPromise,
                              ExceptionState& exceptionState) {
   stopImmediatePropagation();
   if (m_observer)
     m_observer->respondWith(scriptState, scriptPromise, exceptionState);
 }
 
-ScriptPromise FetchEvent::navigationPreload(ScriptState* scriptState) {
-  return m_navigationPreloadProperty->promise(scriptState->world());
+ScriptPromise FetchEvent::preloadResponse(ScriptState* scriptState) {
+  return m_preloadResponseProperty->promise(scriptState->world());
 }
 
 const AtomicString& FetchEvent::interfaceName() const {
   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_navigationPreloadProperty(new PreloadResponseProperty(
+      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_navigationPreloadProperty->resolve(nullptr);
+    m_preloadResponseProperty->resolve(nullptr);
   }
 
   m_clientId = initializer.clientId();
   m_isReload = initializer.isReload();
   if (initializer.hasRequest()) {
     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()) {
@@ skipping 13 matching lines @@
     // TODO(yhirano): Add an assertion that it returns true once the
     // graceful shutdown mechanism is introduced.
   }
 }
 
 void FetchEvent::onNavigationPreloadResponse(
     std::unique_ptr<WebServiceWorkerResponse> response,
     std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) {
   if (!m_scriptState->contextIsValid())
     return;
-  DCHECK(m_navigationPreloadProperty);
+  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))));
   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_navigationPreloadProperty->resolve(
+  m_preloadResponseProperty->resolve(
       Response::create(m_scriptState->getExecutionContext(), taintedResponse));
 }
 
 void FetchEvent::onNavigationPreloadError(
     std::unique_ptr<WebServiceWorkerError> error) {
   if (!m_scriptState->contextIsValid())
     return;
-  DCHECK(m_navigationPreloadProperty);
-  m_navigationPreloadProperty->reject(
+  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_navigationPreloadProperty);
+  visitor->trace(m_preloadResponseProperty);
   ExtendableEvent::trace(visitor);
 }
 
 }  // namespace blink