Rename es => exceptionState in other than bindings/

Source/modules/crypto/SubtleCrypto.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "public/platform/WebCryptoAlgorithm.h"
 #include "wtf/ArrayBufferView.h"
 
 namespace WebCore {
 
 // FIXME: asynchronous completion of CryptoResult. Need to re-enter the
 //        v8::Context before trying to fulfill the promise, and enable test.
 
 namespace {
 
-ScriptPromise startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, AlgorithmOperation operationType, ArrayBufferView* signature, ArrayBufferView* dataBuffer, ExceptionState& es)
+ScriptPromise startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, AlgorithmOperation operationType, ArrayBufferView* signature, ArrayBufferView* dataBuffer, ExceptionState& exceptionState)
 {
     bool requiresKey = operationType != Digest;
 
     // Seems like the generated bindings should take care of these however it
     // currently doesn't. See also http://crbugh.com/264520
     if (requiresKey && !key) {
-        es.throwTypeError("Invalid key argument");
+        exceptionState.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
     if (operationType == Verify && !signature) {
-        es.throwTypeError("Invalid signature argument");
+        exceptionState.throwTypeError("Invalid signature argument");
         return ScriptPromise();
     }
     if (!dataBuffer) {
-        es.throwTypeError("Invalid dataBuffer argument");
+        exceptionState.throwTypeError("Invalid dataBuffer argument");
         return ScriptPromise();
     }
 
     blink::WebCryptoAlgorithm algorithm;
-    if (!normalizeAlgorithm(rawAlgorithm, operationType, algorithm, es))
+    if (!normalizeAlgorithm(rawAlgorithm, operationType, algorithm, exceptionState))
         return ScriptPromise();
 
-    if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, es))
+    if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, exceptionState))
         return ScriptPromise();
 
     const unsigned char* data = static_cast<const unsigned char*>(dataBuffer->baseAddress());
     unsigned dataSize = dataBuffer->byteLength();
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
 
     switch (operationType) {
     case Encrypt:
@@ skipping 19 matching lines @@
     return promise;
 }
 
 } // namespace
 
 SubtleCrypto::SubtleCrypto()
 {
     ScriptWrappable::init(this);
 }
 
-ScriptPromise SubtleCrypto::encrypt(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& es)
+ScriptPromise SubtleCrypto::encrypt(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& exceptionState)
 {
-    return startCryptoOperation(rawAlgorithm, key, Encrypt, 0, data, es);
+    return startCryptoOperation(rawAlgorithm, key, Encrypt, 0, data, exceptionState);
 }
 
-ScriptPromise SubtleCrypto::decrypt(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& es)
+ScriptPromise SubtleCrypto::decrypt(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& exceptionState)
 {
-    return startCryptoOperation(rawAlgorithm, key, Decrypt, 0, data, es);
+    return startCryptoOperation(rawAlgorithm, key, Decrypt, 0, data, exceptionState);
 }
 
-ScriptPromise SubtleCrypto::sign(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& es)
+ScriptPromise SubtleCrypto::sign(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* data, ExceptionState& exceptionState)
 {
-    return startCryptoOperation(rawAlgorithm, key, Sign, 0, data, es);
+    return startCryptoOperation(rawAlgorithm, key, Sign, 0, data, exceptionState);
 }
 
-ScriptPromise SubtleCrypto::verifySignature(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* signature, ArrayBufferView* data, ExceptionState& es)
+ScriptPromise SubtleCrypto::verifySignature(const Dictionary& rawAlgorithm, Key* key, ArrayBufferView* signature, ArrayBufferView* data, ExceptionState& exceptionState)
 {
-    return startCryptoOperation(rawAlgorithm, key, Verify, signature, data, es);
+    return startCryptoOperation(rawAlgorithm, key, Verify, signature, data, exceptionState);
 }
 
-ScriptPromise SubtleCrypto::digest(const Dictionary& rawAlgorithm, ArrayBufferView* data, ExceptionState& es)
+ScriptPromise SubtleCrypto::digest(const Dictionary& rawAlgorithm, ArrayBufferView* data, ExceptionState& exceptionState)
 {
-    return startCryptoOperation(rawAlgorithm, 0, Digest, 0, data, es);
+    return startCryptoOperation(rawAlgorithm, 0, Digest, 0, data, exceptionState);
 }
 
-ScriptPromise SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
+ScriptPromise SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& exceptionState)
 {
     blink::WebCryptoKeyUsageMask keyUsages;
-    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, exceptionState))
         return ScriptPromise();
 
     blink::WebCryptoAlgorithm algorithm;
-    if (!normalizeAlgorithm(rawAlgorithm, GenerateKey, algorithm, es))
+    if (!normalizeAlgorithm(rawAlgorithm, GenerateKey, algorithm, exceptionState))
         return ScriptPromise();
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     blink::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
-ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
+ScriptPromise SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& exceptionState)
 {
     blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, es))
+    if (!Key::parseFormat(rawFormat, format, exceptionState))
         return ScriptPromise();
 
     if (!keyData) {
-        es.throwTypeError("Invalid keyData argument");
+        exceptionState.throwTypeError("Invalid keyData argument");
         return ScriptPromise();
     }
 
     blink::WebCryptoKeyUsageMask keyUsages;
-    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
+    if (!Key::parseUsageMask(rawKeyUsages, keyUsages, exceptionState))
         return ScriptPromise();
 
     // The algorithm is optional.
     blink::WebCryptoAlgorithm algorithm;
-    if (!rawAlgorithm.isUndefinedOrNull() && !normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, es))
+    if (!rawAlgorithm.isUndefinedOrNull() && !normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, exceptionState))
         return ScriptPromise();
 
     const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->baseAddress());
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     blink::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
-ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, ExceptionState& es)
+ScriptPromise SubtleCrypto::exportKey(const String& rawFormat, Key* key, ExceptionState& exceptionState)
 {
     blink::WebCryptoKeyFormat format;
-    if (!Key::parseFormat(rawFormat, format, es))
+    if (!Key::parseFormat(rawFormat, format, exceptionState))
         return ScriptPromise();
 
     if (!key) {
-        es.throwTypeError("Invalid key argument");
+        exceptionState.throwTypeError("Invalid key argument");
         return ScriptPromise();
     }
 
     if (!key->extractable()) {
-        es.throwDOMException(NotSupportedError, "key is not extractable");
+        exceptionState.throwDOMException(NotSupportedError, "key is not extractable");
         return ScriptPromise();
     }
 
     ScriptPromise promise = ScriptPromise::createPending();
     RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(promise);
     blink::Platform::current()->crypto()->exportKey(format, key->key(), result->result());
     return promise;
 }
 
 } // namespace WebCore