blink: Rename modules/ method to prefix with get when they collide.

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 104 matching lines @@
         , m_resolveType(type)
     {
     }
 
     ScriptValue call(ScriptValue value) override
     {
         ASSERT(m_observer);
         ASSERT(m_resolveType == Fulfilled || m_resolveType == Rejected);
         if (m_resolveType == Rejected) {
             m_observer->responseWasRejected(WebServiceWorkerResponseErrorPromiseRejected);
-            value = ScriptPromise::reject(value.scriptState(), value).getScriptValue();
+            value = ScriptPromise::reject(value.getScriptState(), value).getScriptValue();
         } else {
             m_observer->responseWasFulfilled(value);
         }
         m_observer = nullptr;
         return value;
     }
 
     Member<RespondWithObserver> m_observer;
     ResolveType m_resolveType;
 };
 
 RespondWithObserver* RespondWithObserver::create(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext)
 {
     return new RespondWithObserver(context, eventID, requestURL, requestMode, frameType, requestContext);
 }
 
 void RespondWithObserver::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
     m_state = Done;
 }
 
 void RespondWithObserver::didDispatchEvent(DispatchEventResult dispatchResult)
 {
-    ASSERT(executionContext());
+    ASSERT(getExecutionContext());
     if (m_state != Initial)
         return;
 
     if (dispatchResult != DispatchEventResult::NotCanceled) {
         responseWasRejected(WebServiceWorkerResponseErrorDefaultPrevented);
         return;
     }
 
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID);
+    ServiceWorkerGlobalScopeClient::from(getExecutionContext())->didHandleFetchEvent(m_eventID);
     m_state = Done;
 }
 
 void RespondWithObserver::respondWith(ScriptState* scriptState, ScriptPromise scriptPromise, ExceptionState& exceptionState)
 {
     if (m_state != Initial) {
         exceptionState.throwDOMException(InvalidStateError, "The fetch event has already been responded to.");
         return;
     }
 
     m_state = Pending;
     scriptPromise.then(
         ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled),
         ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected));
 }
 
 void RespondWithObserver::responseWasRejected(WebServiceWorkerResponseError error)
 {
-    ASSERT(executionContext());
-    executionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, getMessageForResponseError(error, m_requestURL)));
+    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(executionContext())->didHandleFetchEvent(m_eventID, webResponse);
+    ServiceWorkerGlobalScopeClient::from(getExecutionContext())->didHandleFetchEvent(m_eventID, webResponse);
     m_state = Done;
 }
 
 void RespondWithObserver::responseWasFulfilled(const ScriptValue& value)
 {
-    ASSERT(executionContext());
-    if (!V8Response::hasInstance(value.v8Value(), toIsolate(executionContext()))) {
+    ASSERT(getExecutionContext());
+    if (!V8Response::hasInstance(value.v8Value(), toIsolate(getExecutionContext()))) {
         responseWasRejected(WebServiceWorkerResponseErrorNoV8Instance);
         return;
     }
-    Response* response = V8Response::toImplWithTypeCheck(toIsolate(executionContext()), value.v8Value());
+    Response* response = V8Response::toImplWithTypeCheck(toIsolate(getExecutionContext()), value.v8Value());
     // "If one of the following conditions is true, return a network error:
     //   - |response|'s type is |error|.
     //   - |request|'s mode is not |no-cors| and response's type is |opaque|.
     //   - |request| is a client request and |response|'s type is neither
     //     |basic| nor |default|."
     const FetchResponseData::Type responseType = response->response()->getType();
     if (responseType == FetchResponseData::ErrorType) {
         responseWasRejected(WebServiceWorkerResponseErrorResponseTypeError);
         return;
     }
@@ skipping 27 matching lines @@
     }
 
     WebServiceWorkerResponse webResponse;
     response->populateWebServiceWorkerResponse(webResponse);
     BodyStreamBuffer* buffer = response->internalBodyBuffer();
     if (buffer) {
         RefPtr<BlobDataHandle> blobDataHandle = buffer->drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize);
         if (blobDataHandle) {
             webResponse.setBlobDataHandle(blobDataHandle);
         } else {
-            Stream* outStream = Stream::create(executionContext(), "");
+            Stream* outStream = Stream::create(getExecutionContext(), "");
             webResponse.setStreamURL(outStream->url());
-            buffer->startLoading(executionContext(), FetchDataLoader::createLoaderAsStream(outStream), new NoopLoaderClient);
+            buffer->startLoading(getExecutionContext(), FetchDataLoader::createLoaderAsStream(outStream), new NoopLoaderClient);
         }
     }
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID, webResponse);
+    ServiceWorkerGlobalScopeClient::from(getExecutionContext())->didHandleFetchEvent(m_eventID, webResponse);
     m_state = Done;
 }
 
 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext)
     : ContextLifecycleObserver(context)
     , m_eventID(eventID)
     , m_requestURL(requestURL)
     , m_requestMode(requestMode)
     , m_frameType(frameType)
     , m_requestContext(requestContext)
     , m_state(Initial)
 {
 }
 
 DEFINE_TRACE(RespondWithObserver)
 {
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink