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

Side by Side Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 341 }
342 342
343 void WebEmbeddedWorkerImpl::startWorkerThread() 343 void WebEmbeddedWorkerImpl::startWorkerThread()
344 { 344 {
345 ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload); 345 ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload);
346 ASSERT(!m_askedToTerminate); 346 ASSERT(!m_askedToTerminate);
347 347
348 Document* document = m_mainFrame->frame()->document(); 348 Document* document = m_mainFrame->frame()->document();
349 349
350 // FIXME: this document's origin is pristine and without any extra privilege s. (crbug.com/254993) 350 // FIXME: this document's origin is pristine and without any extra privilege s. (crbug.com/254993)
351 SecurityOrigin* starterOrigin = document->securityOrigin(); 351 SecurityOrigin* starterOrigin = document->getSecurityOrigin();
352 352
353 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create(); 353 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create();
354 provideContentSettingsClientToWorker(workerClients.get(), m_contentSettingsC lient.release()); 354 provideContentSettingsClientToWorker(workerClients.get(), m_contentSettingsC lient.release());
355 provideServiceWorkerGlobalScopeClientToWorker(workerClients.get(), ServiceWo rkerGlobalScopeClientImpl::create(*m_workerContextClient)); 355 provideServiceWorkerGlobalScopeClientToWorker(workerClients.get(), ServiceWo rkerGlobalScopeClientImpl::create(*m_workerContextClient));
356 provideServiceWorkerContainerClientToWorker(workerClients.get(), adoptPtr(m_ workerContextClient->createServiceWorkerProvider())); 356 provideServiceWorkerContainerClientToWorker(workerClients.get(), adoptPtr(m_ workerContextClient->createServiceWorkerProvider()));
357 357
358 // We need to set the CSP to both the shadow page's document and the Service WorkerGlobalScope. 358 // We need to set the CSP to both the shadow page's document and the Service WorkerGlobalScope.
359 document->initContentSecurityPolicy(m_mainScriptLoader->releaseContentSecuri tyPolicy()); 359 document->initContentSecurityPolicy(m_mainScriptLoader->releaseContentSecuri tyPolicy());
360 360
361 KURL scriptURL = m_mainScriptLoader->url(); 361 KURL scriptURL = m_mainScriptLoader->url();
(...skipping 13 matching lines...) Expand all
375 m_mainScriptLoader.clear(); 375 m_mainScriptLoader.clear();
376 376
377 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc ument, *m_workerContextClient); 377 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc ument, *m_workerContextClient);
378 m_loaderProxy = WorkerLoaderProxy::create(this); 378 m_loaderProxy = WorkerLoaderProxy::create(this);
379 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS copeProxy); 379 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS copeProxy);
380 m_workerThread->start(startupData.release()); 380 m_workerThread->start(startupData.release());
381 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL); 381 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
382 } 382 }
383 383
384 } // namespace blink 384 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebDocument.cpp ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698