third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.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

« no previous file with comments | « third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp ('k') | third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

index f187c2abf27cbfddcec50030f6faf35b69275eb7..283cccab835df5a8292ece4833a2051db57adcba 100644

--- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

+++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

@@ -230,7 +230,7 @@ void ServiceWorkerGlobalScopeProxy::didEvaluateWorkerScript(bool success)

void ServiceWorkerGlobalScopeProxy::didInitializeWorkerContext()

{

- ScriptState::Scope scope(workerGlobalScope()->scriptController()->scriptState());

+ ScriptState::Scope scope(workerGlobalScope()->scriptController()->getScriptState());

client().didInitializeWorkerContext(workerGlobalScope()->scriptController()->context());

}

@@ -297,7 +297,7 @@ void ServiceWorkerGlobalScopeProxy::dispatchFetchEventImpl(int eventID, const We

{

RespondWithObserver* observer = RespondWithObserver::create(workerGlobalScope(), eventID, webRequest.url(), webRequest.mode(), webRequest.frameType(), webRequest.requestContext());

Request* request = Request::create(workerGlobalScope(), webRequest);

- request->headers()->setGuard(Headers::ImmutableGuard);

+ request->getHeaders()->setGuard(Headers::ImmutableGuard);

FetchEventInit eventInit;

eventInit.setCancelable(true);

eventInit.setRequest(request);