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

Unified Diff: third_party/WebKit/Source/core/workers/AbstractWorker.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/core/workers/AbstractWorker.cpp
diff --git a/third_party/WebKit/Source/core/workers/AbstractWorker.cpp b/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
index f60bda9eb7c27a23325671cc06744bdfd30bf5ca..fc94b81959ada9fd993b79d7a46b86228ee1f34e 100644
--- a/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
+++ b/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
@@ -50,19 +50,19 @@ AbstractWorker::~AbstractWorker()
KURL AbstractWorker::resolveURL(const String& url, ExceptionState& exceptionState)
{
// FIXME: This should use the dynamic global scope (bug #27887)
- KURL scriptURL = executionContext()->completeURL(url);
+ KURL scriptURL = getExecutionContext()->completeURL(url);
if (!scriptURL.isValid()) {
exceptionState.throwDOMException(SyntaxError, "'" + url + "' is not a valid URL.");
return KURL();
}
// We can safely expose the URL in the following exceptions, as these checks happen synchronously before redirection. JavaScript receives no new information.
- if (!executionContext()->securityOrigin()->canRequestNoSuborigin(scriptURL)) {
- exceptionState.throwSecurityError("Script at '" + scriptURL.elidedString() + "' cannot be accessed from origin '" + executionContext()->securityOrigin()->toString() + "'.");
+ if (!getExecutionContext()->getSecurityOrigin()->canRequestNoSuborigin(scriptURL)) {
+ exceptionState.throwSecurityError("Script at '" + scriptURL.elidedString() + "' cannot be accessed from origin '" + getExecutionContext()->getSecurityOrigin()->toString() + "'.");
return KURL();
}
- if (executionContext()->contentSecurityPolicy() && !executionContext()->contentSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) {
+ if (getExecutionContext()->contentSecurityPolicy() && !getExecutionContext()->contentSecurityPolicy()->allowWorkerContextFromSource(scriptURL)) {
exceptionState.throwSecurityError("Access to the script at '" + scriptURL.elidedString() + "' is denied by the document's Content Security Policy.");
return KURL();
}

Powered by Google App Engine
This is Rietveld 408576698