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

Unified Diff: Source/core/workers/AbstractWorker.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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
« no previous file with comments | « Source/core/timing/PerformanceUserTiming.cpp ('k') | Source/core/workers/DedicatedWorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/workers/AbstractWorker.cpp
diff --git a/Source/core/workers/AbstractWorker.cpp b/Source/core/workers/AbstractWorker.cpp
index ac7856dfcf62ad5795e345191c9de2695310a58d..9250d47d9e44d2a28b1336e48388f7ba9ab274cc 100644
--- a/Source/core/workers/AbstractWorker.cpp
+++ b/Source/core/workers/AbstractWorker.cpp
@@ -49,28 +49,28 @@ AbstractWorker::~AbstractWorker()
{
}
-KURL AbstractWorker::resolveURL(const String& url, ExceptionState& es)
+KURL AbstractWorker::resolveURL(const String& url, ExceptionState& exceptionState)
{
if (url.isEmpty()) {
- es.throwDOMException(SyntaxError, "Failed to create a worker: an empty URL was provided.");
+ exceptionState.throwDOMException(SyntaxError, "Failed to create a worker: an empty URL was provided.");
return KURL();
}
// FIXME: This should use the dynamic global scope (bug #27887)
KURL scriptURL = executionContext()->completeURL(url);
if (!scriptURL.isValid()) {
- es.throwDOMException(SyntaxError, "Failed to create a worker: '" + url + "' is not a valid URL.");
+ exceptionState.throwDOMException(SyntaxError, "Failed to create a worker: '" + 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()->canRequest(scriptURL)) {
- es.throwSecurityError("Failed to create a worker: script at '" + scriptURL.elidedString() + "' cannot be accessed from origin '" + executionContext()->securityOrigin()->toString() + "'.");
+ exceptionState.throwSecurityError("Failed to create a worker: script at '" + scriptURL.elidedString() + "' cannot be accessed from origin '" + executionContext()->securityOrigin()->toString() + "'.");
return KURL();
}
if (executionContext()->contentSecurityPolicy() && !executionContext()->contentSecurityPolicy()->allowScriptFromSource(scriptURL)) {
- es.throwSecurityError("Failed to create a worker: access to the script at '" + scriptURL.elidedString() + "' is denied by the document's Content Security Policy.");
+ exceptionState.throwSecurityError("Failed to create a worker: access to the script at '" + scriptURL.elidedString() + "' is denied by the document's Content Security Policy.");
return KURL();
}
« no previous file with comments | « Source/core/timing/PerformanceUserTiming.cpp ('k') | Source/core/workers/DedicatedWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698