blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/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 37 matching lines @@
     AlgorithmError error;
     bool success = normalizeAlgorithm(raw, op, algorithm, &error);
     if (!success)
         result->completeWithError(error.errorType, error.errorDetails);
     return success;
 }
 
 static bool canAccessWebCrypto(ScriptState* scriptState, CryptoResult* result)
 {
     String errorMessage;
-    if (!scriptState->executionContext()->isSecureContext(errorMessage, ExecutionContext::WebCryptoSecureContextCheck)) {
+    if (!scriptState->getExecutionContext()->isSecureContext(errorMessage, ExecutionContext::WebCryptoSecureContextCheck)) {
         result->completeWithError(WebCryptoErrorTypeNotSupported, errorMessage);
         return false;
     }
 
     return true;
 }
 
 static bool copyStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
 {
     String value;
@@ skipping 57 matching lines @@
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationEncrypt, algorithm, result))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageEncrypt, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, key->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, key->key());
     Platform::current()->crypto()->encrypt(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& data)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDecrypt, algorithm, result))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageDecrypt, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, key->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, key->key());
     Platform::current()->crypto()->decrypt(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& data)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationSign, algorithm, result))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageSign, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, key->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, key->key());
     Platform::current()->crypto()->sign(algorithm, key->key(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const DOMArrayPiece& signature, const DOMArrayPiece& data)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationVerify, algorithm, result))
         return promise;
 
     if (!key->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageVerify, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, key->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, key->key());
     Platform::current()->crypto()->verifySignature(algorithm, key->key(), signature.bytes(), signature.byteLength(), data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, const DOMArrayPiece& data)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDigest, algorithm, result))
         return promise;
 
-    histogramAlgorithm(scriptState->executionContext(), algorithm);
+    histogramAlgorithm(scriptState->getExecutionContext(), algorithm);
     Platform::current()->crypto()->digest(algorithm, data.bytes(), data.byteLength(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoKeyUsageMask keyUsages;
     if (!CryptoKey::parseUsageMask(rawKeyUsages, keyUsages, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationGenerateKey, algorithm, result))
         return promise;
 
-    histogramAlgorithm(scriptState->executionContext(), algorithm);
+    histogramAlgorithm(scriptState->getExecutionContext(), algorithm);
     Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& rawFormat, const ArrayBufferOrArrayBufferViewOrDictionary& keyData, const AlgorithmIdentifier& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
@@ skipping 30 matching lines @@
         len = keyData.getAsArrayBuffer()->byteLength();
     } else if (keyData.isArrayBufferView()) {
         ptr = static_cast<const unsigned char*>(keyData.getAsArrayBufferView()->baseAddress());
         len = keyData.getAsArrayBufferView()->byteLength();
     } else if (keyData.isDictionary()) {
         if (!copyJwkDictionaryToJson(keyData.getAsDictionary(), jsonUtf8, result))
             return promise;
         ptr = reinterpret_cast<const unsigned char*>(jsonUtf8.data());
         len = jsonUtf8.length();
     }
-    histogramAlgorithm(scriptState->executionContext(), algorithm);
+    histogramAlgorithm(scriptState->getExecutionContext(), algorithm);
     Platform::current()->crypto()->importKey(format, ptr, len, algorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, CryptoKey* key)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
         return promise;
     }
 
-    histogramKey(scriptState->executionContext(), key->key());
+    histogramKey(scriptState->getExecutionContext(), key->key());
     Platform::current()->crypto()->exportKey(format, key->key(), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawFormat, CryptoKey* key, CryptoKey* wrappingKey, const AlgorithmIdentifier& rawWrapAlgorithm)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoKeyFormat format;
     if (!CryptoKey::parseFormat(rawFormat, format, result))
         return promise;
 
     WebCryptoAlgorithm wrapAlgorithm;
     if (!parseAlgorithm(rawWrapAlgorithm, WebCryptoOperationWrapKey, wrapAlgorithm, result))
         return promise;
 
     if (!key->extractable()) {
         result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
         return promise;
     }
 
     if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, WebCryptoKeyUsageWrapKey, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), wrapAlgorithm, wrappingKey->key());
-    histogramKey(scriptState->executionContext(), key->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), wrapAlgorithm, wrappingKey->key());
+    histogramKey(scriptState->getExecutionContext(), key->key());
     Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& rawFormat, const DOMArrayPiece& wrappedKey, CryptoKey* unwrappingKey, const AlgorithmIdentifier& rawUnwrapAlgorithm, const AlgorithmIdentifier& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
@@ skipping 11 matching lines @@
     if (!parseAlgorithm(rawUnwrapAlgorithm, WebCryptoOperationUnwrapKey, unwrapAlgorithm, result))
         return promise;
 
     WebCryptoAlgorithm unwrappedKeyAlgorithm;
     if (!parseAlgorithm(rawUnwrappedKeyAlgorithm, WebCryptoOperationImportKey, unwrappedKeyAlgorithm, result))
         return promise;
 
     if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, WebCryptoKeyUsageUnwrapKey, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), unwrapAlgorithm, unwrappingKey->key());
-    histogramAlgorithm(scriptState->executionContext(), unwrappedKeyAlgorithm);
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), unwrapAlgorithm, unwrappingKey->key());
+    histogramAlgorithm(scriptState->getExecutionContext(), unwrappedKeyAlgorithm);
     Platform::current()->crypto()->unwrapKey(format, wrappedKey.bytes(), wrappedKey.byteLength(), unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::deriveBits(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, unsigned lengthBits)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     WebCryptoAlgorithm algorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDeriveBits, algorithm, result))
         return promise;
 
     if (!baseKey->canBeUsedForAlgorithm(algorithm, WebCryptoKeyUsageDeriveBits, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, baseKey->key());
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, baseKey->key());
     Platform::current()->crypto()->deriveBits(algorithm, baseKey->key(), lengthBits, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::deriveKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, const AlgorithmIdentifier& rawDerivedKeyType, bool extractable, const Vector<String>& rawKeyUsages)
 {
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
@@ skipping 11 matching lines @@
         return promise;
 
     WebCryptoAlgorithm importAlgorithm;
     if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationImportKey, importAlgorithm, result))
         return promise;
 
     WebCryptoAlgorithm keyLengthAlgorithm;
     if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationGetKeyLength, keyLengthAlgorithm, result))
         return promise;
 
-    histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, baseKey->key());
-    histogramAlgorithm(scriptState->executionContext(), importAlgorithm);
+    histogramAlgorithmAndKey(scriptState->getExecutionContext(), algorithm, baseKey->key());
+    histogramAlgorithm(scriptState->getExecutionContext(), importAlgorithm);
     Platform::current()->crypto()->deriveKey(algorithm, baseKey->key(), importAlgorithm, keyLengthAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 } // namespace blink