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(); |
} |