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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 document().postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&WebEmbe ddedWorkerImpl::postMessageToPageInspector, m_embeddedWorker, message)); 223 document().postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&WebEmbe ddedWorkerImpl::postMessageToPageInspector, m_embeddedWorker, message));
224 } 224 }
225 225
226 void ServiceWorkerGlobalScopeProxy::didEvaluateWorkerScript(bool success) 226 void ServiceWorkerGlobalScopeProxy::didEvaluateWorkerScript(bool success)
227 { 227 {
228 client().didEvaluateWorkerScript(success); 228 client().didEvaluateWorkerScript(success);
229 } 229 }
230 230
231 void ServiceWorkerGlobalScopeProxy::didInitializeWorkerContext() 231 void ServiceWorkerGlobalScopeProxy::didInitializeWorkerContext()
232 { 232 {
233 ScriptState::Scope scope(workerGlobalScope()->scriptController()->scriptStat e()); 233 ScriptState::Scope scope(workerGlobalScope()->scriptController()->getScriptS tate());
234 client().didInitializeWorkerContext(workerGlobalScope()->scriptController()- >context()); 234 client().didInitializeWorkerContext(workerGlobalScope()->scriptController()- >context());
235 } 235 }
236 236
237 void ServiceWorkerGlobalScopeProxy::workerGlobalScopeStarted(WorkerGlobalScope* workerGlobalScope) 237 void ServiceWorkerGlobalScopeProxy::workerGlobalScopeStarted(WorkerGlobalScope* workerGlobalScope)
238 { 238 {
239 ASSERT(!m_workerGlobalScope); 239 ASSERT(!m_workerGlobalScope);
240 m_workerGlobalScope = static_cast<ServiceWorkerGlobalScope*>(workerGlobalSco pe); 240 m_workerGlobalScope = static_cast<ServiceWorkerGlobalScope*>(workerGlobalSco pe);
241 client().workerContextStarted(this); 241 client().workerContextStarted(this);
242 } 242 }
243 243
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con st 290 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con st
291 { 291 {
292 ASSERT(m_workerGlobalScope); 292 ASSERT(m_workerGlobalScope);
293 return m_workerGlobalScope; 293 return m_workerGlobalScope;
294 } 294 }
295 295
296 void ServiceWorkerGlobalScopeProxy::dispatchFetchEventImpl(int eventID, const We bServiceWorkerRequest& webRequest, const AtomicString& eventTypeName) 296 void ServiceWorkerGlobalScopeProxy::dispatchFetchEventImpl(int eventID, const We bServiceWorkerRequest& webRequest, const AtomicString& eventTypeName)
297 { 297 {
298 RespondWithObserver* observer = RespondWithObserver::create(workerGlobalScop e(), eventID, webRequest.url(), webRequest.mode(), webRequest.frameType(), webRe quest.requestContext()); 298 RespondWithObserver* observer = RespondWithObserver::create(workerGlobalScop e(), eventID, webRequest.url(), webRequest.mode(), webRequest.frameType(), webRe quest.requestContext());
299 Request* request = Request::create(workerGlobalScope(), webRequest); 299 Request* request = Request::create(workerGlobalScope(), webRequest);
300 request->headers()->setGuard(Headers::ImmutableGuard); 300 request->getHeaders()->setGuard(Headers::ImmutableGuard);
301 FetchEventInit eventInit; 301 FetchEventInit eventInit;
302 eventInit.setCancelable(true); 302 eventInit.setCancelable(true);
303 eventInit.setRequest(request); 303 eventInit.setRequest(request);
304 eventInit.setClientId(webRequest.isMainResourceLoad() ? WebString() : webReq uest.clientId()); 304 eventInit.setClientId(webRequest.isMainResourceLoad() ? WebString() : webReq uest.clientId());
305 eventInit.setIsReload(webRequest.isReload()); 305 eventInit.setIsReload(webRequest.isReload());
306 RefPtrWillBeRawPtr<FetchEvent> fetchEvent(FetchEvent::create(eventTypeName, eventInit, observer)); 306 RefPtrWillBeRawPtr<FetchEvent> fetchEvent(FetchEvent::create(eventTypeName, eventInit, observer));
307 DispatchEventResult dispatchResult = workerGlobalScope()->dispatchEvent(fetc hEvent.release()); 307 DispatchEventResult dispatchResult = workerGlobalScope()->dispatchEvent(fetc hEvent.release());
308 observer->didDispatchEvent(dispatchResult); 308 observer->didDispatchEvent(dispatchResult);
309 } 309 }
310 310
311 } // namespace blink 311 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698