Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchManager.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/fetch/FetchManager.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
index 6983e91ed3b8fc9fb8c5a8ae0d2e8e7041f31caf..b7a73319eb9cb49988e34137a9fed6a0f72085fe 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
@@ -339,7 +339,7 @@ void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceRespo
}
}
- Response* r = Response::create(m_resolver->executionContext(), taintedResponse);
+ Response* r = Response::create(m_resolver->getExecutionContext(), taintedResponse);
if (response.url().protocolIsData()) {
// An "Access-Control-Allow-Origin" header is added for data: URLs
// but no headers except for "Content-Type" should exist,
@@ -689,9 +689,9 @@ void FetchManager::Loader::failed(const String& message)
if (!message.isEmpty())
m_executionContext->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
if (m_resolver) {
- if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
return;
- ScriptState* state = m_resolver->scriptState();
+ ScriptState* state = m_resolver->getScriptState();
ScriptState::Scope scope(state);
m_resolver->reject(V8ThrowException::createTypeError(state->isolate(), "Failed to fetch"));
}
@@ -727,7 +727,7 @@ ScriptPromise FetchManager::fetch(ScriptState* scriptState, FetchRequestData* re
request->setContext(WebURLRequest::RequestContextFetch);
- Loader* loader = Loader::create(executionContext(), this, resolver, request, scriptState->world().isIsolatedWorld());
+ Loader* loader = Loader::create(getExecutionContext(), this, resolver, request, scriptState->world().isIsolatedWorld());
m_loaders.add(loader);
loader->start();
return promise;

Powered by Google App Engine
This is Rietveld 408576698