Use fetch_event_id (fetchEventID in blink) for FetchEvent

third_party/WebKit/Source/modules/serviceworkers/RespondWithObserver.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/RespondWithObserver.h"
 
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 156 matching lines @@
   }
 
   Member<RespondWithObserver> m_observer;
   ResolveType m_resolveType;
 };
 
 RespondWithObserver::~RespondWithObserver() {}
 
 RespondWithObserver* RespondWithObserver::create(
     ExecutionContext* context,
-    int eventID,
+    int fetchEventID,
     const KURL& requestURL,
     WebURLRequest::FetchRequestMode requestMode,
     WebURLRequest::FrameType frameType,
     WebURLRequest::RequestContext requestContext,
     WaitUntilObserver* observer) {
-  return new RespondWithObserver(context, eventID, requestURL, requestMode,
+  return new RespondWithObserver(context, fetchEventID, requestURL, requestMode,
                                  frameType, requestContext, observer);
 }
 
 void RespondWithObserver::contextDestroyed() {
   ContextLifecycleObserver::contextDestroyed();
   if (m_observer) {
     DCHECK_EQ(Pending, m_state);
     m_observer.clear();
   }
   m_state = Done;
 }
 
 void RespondWithObserver::willDispatchEvent() {
   m_eventDispatchTime = WTF::currentTime();
 }
 
 void RespondWithObserver::didDispatchEvent(DispatchEventResult dispatchResult) {
   ASSERT(getExecutionContext());
   if (m_state != Initial)
     return;
 
   if (dispatchResult != DispatchEventResult::NotCanceled) {
     m_observer->incrementPendingActivity();
     responseWasRejected(WebServiceWorkerResponseErrorDefaultPrevented);
     return;
   }
 
   ServiceWorkerGlobalScopeClient::from(getExecutionContext())
-      ->respondToFetchEvent(m_eventID, m_eventDispatchTime);
+      ->respondToFetchEvent(m_fetchEventID, m_eventDispatchTime);
   m_state = Done;
   m_observer.clear();
 }
 
 void RespondWithObserver::respondWith(ScriptState* scriptState,
                                       ScriptPromise scriptPromise,
                                       ExceptionState& exceptionState) {
   if (m_state != Initial) {
     exceptionState.throwDOMException(
         InvalidStateError, "The fetch event has already been responded to.");
@@ skipping 12 matching lines @@
   ASSERT(getExecutionContext());
   getExecutionContext()->addConsoleMessage(
       ConsoleMessage::create(JSMessageSource, WarningMessageLevel,
                              getMessageForResponseError(error, m_requestURL)));
 
   // The default value of WebServiceWorkerResponse's status is 0, which maps
   // to a network error.
   WebServiceWorkerResponse webResponse;
   webResponse.setError(error);
   ServiceWorkerGlobalScopeClient::from(getExecutionContext())
-      ->respondToFetchEvent(m_eventID, webResponse, m_eventDispatchTime);
+      ->respondToFetchEvent(m_fetchEventID, webResponse, m_eventDispatchTime);
   m_state = Done;
   m_observer->decrementPendingActivity();
   m_observer.clear();
 }
 
 void RespondWithObserver::responseWasFulfilled(const ScriptValue& value) {
   ASSERT(getExecutionContext());
   if (!V8Response::hasInstance(value.v8Value(),
                                toIsolate(getExecutionContext()))) {
     responseWasRejected(WebServiceWorkerResponseErrorNoV8Instance);
@@ skipping 52 matching lines @@
     if (blobDataHandle) {
       webResponse.setBlobDataHandle(blobDataHandle);
     } else {
       Stream* outStream = Stream::create(getExecutionContext(), "");
       webResponse.setStreamURL(outStream->url());
       buffer->startLoading(FetchDataLoader::createLoaderAsStream(outStream),
                            new NoopLoaderClient);
     }
   }
   ServiceWorkerGlobalScopeClient::from(getExecutionContext())
-      ->respondToFetchEvent(m_eventID, webResponse, m_eventDispatchTime);
+      ->respondToFetchEvent(m_fetchEventID, webResponse, m_eventDispatchTime);
   m_state = Done;
   m_observer->decrementPendingActivity();
   m_observer.clear();
 }
 
 RespondWithObserver::RespondWithObserver(
     ExecutionContext* context,
-    int eventID,
+    int fetchEventID,
     const KURL& requestURL,
     WebURLRequest::FetchRequestMode requestMode,
     WebURLRequest::FrameType frameType,
     WebURLRequest::RequestContext requestContext,
     WaitUntilObserver* observer)
     : ContextLifecycleObserver(context),
-      m_eventID(eventID),
+      m_fetchEventID(fetchEventID),
       m_requestURL(requestURL),
       m_requestMode(requestMode),
       m_frameType(frameType),
       m_requestContext(requestContext),
       m_state(Initial),
       m_observer(observer) {}
 
 DEFINE_TRACE(RespondWithObserver) {
   visitor->trace(m_observer);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink