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

Unified Diff: third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.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/web/SharedWorkerRepositoryClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp
index d7aeb707da1cedabcd397f99888865558a541d84..bbe636747538cd1ad157b1f939b9277cdb5143be 100644
--- a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp
+++ b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp
@@ -113,14 +113,14 @@ void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, PassOwnPtr<
ASSERT(m_client);
// No nested workers (for now) - connect() should only be called from document context.
- ASSERT(worker->executionContext()->isDocument());
- Document* document = toDocument(worker->executionContext());
+ ASSERT(worker->getExecutionContext()->isDocument());
+ Document* document = toDocument(worker->getExecutionContext());
// TODO(estark): this is broken, as it only uses the first header
// when multiple might have been sent. Fix by making the
// SharedWorkerConnector interface take a map that can contain
// multiple headers.
- OwnPtr<Vector<CSPHeaderAndType>> headers = worker->executionContext()->contentSecurityPolicy()->headers();
+ OwnPtr<Vector<CSPHeaderAndType>> headers = worker->getExecutionContext()->contentSecurityPolicy()->headers();
WebString header;
WebContentSecurityPolicyType headerType = WebContentSecurityPolicyTypeReport;
@@ -131,8 +131,8 @@ void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, PassOwnPtr<
WebWorkerCreationError creationError;
String unusedSecureContextError;
- bool isSecureContext = worker->executionContext()->isSecureContext(unusedSecureContextError);
- OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), header, headerType, worker->executionContext()->securityContext().addressSpace(), isSecureContext ? WebSharedWorkerCreationContextTypeSecure : WebSharedWorkerCreationContextTypeNonsecure, &creationError));
+ bool isSecureContext = worker->getExecutionContext()->isSecureContext(unusedSecureContextError);
+ OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), header, headerType, worker->getExecutionContext()->securityContext().addressSpace(), isSecureContext ? WebSharedWorkerCreationContextTypeSecure : WebSharedWorkerCreationContextTypeNonsecure, &creationError));
if (creationError != WebWorkerCreationErrorNone) {
if (creationError == WebWorkerCreationErrorURLMismatch) {
// Existing worker does not match this url, so return an error back to the caller.

Powered by Google App Engine
This is Rietveld 408576698