Cleanup: Make Platform::crypto() required.

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 32 matching lines @@
 
 namespace WebCore {
 
 // FIXME: asynchronous completion of CryptoResult. Need to re-enter the
 //        v8::Context before trying to fulfill the promise, and enable test.
 
 namespace {
 
 ScriptObject startCryptoOperation(const Dictionary& rawAlgorithm, Key* key, AlgorithmOperation operationType, ArrayBufferView* signature, ArrayBufferView* dataBuffer, ExceptionState& es)
 {
-    WebKit::WebCrypto* platformCrypto = WebKit::Platform::current()->crypto();
-    if (!platformCrypto) {
-        es.throwDOMException(NotSupportedError);
-        return ScriptObject();
-    }
-
     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");
         return ScriptObject();
     }
     if (operationType == Verify && !signature) {
         es.throwTypeError("Invalid signature argument");
@@ skipping 11 matching lines @@
     if (requiresKey && !key->canBeUsedForAlgorithm(algorithm, operationType, es))
         return ScriptObject();
 
     const unsigned char* data = static_cast<const unsigned char*>(dataBuffer->baseAddress());
     size_t dataSize = dataBuffer->byteLength();
 
     RefPtr<CryptoResult> result = CryptoResult::create();
 
     switch (operationType) {
     case Encrypt:
-        platformCrypto->encrypt(algorithm, key->key(), data, dataSize, result->result());
+        WebKit::Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Decrypt:
-        platformCrypto->decrypt(algorithm, key->key(), data, dataSize, result->result());
+        WebKit::Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Sign:
-        platformCrypto->sign(algorithm, key->key(), data, dataSize, result->result());
+        WebKit::Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result());
         break;
     case Verify:
-        platformCrypto->verifySignature(algorithm, key->key(), reinterpret_cast<const unsigned char*>(signature->baseAddress()), signature->byteLength(), data, dataSize, result->result());
+        WebKit::Platform::current()->crypto()->verifySignature(algorithm, key->key(), reinterpret_cast<const unsigned char*>(signature->baseAddress()), signature->byteLength(), data, dataSize, result->result());
         break;
     case Digest:
-        platformCrypto->digest(algorithm, data, dataSize, result->result());
+        WebKit::Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result());
         break;
     default:
         ASSERT_NOT_REACHED();
         return ScriptObject();
     }
 
     return result->promise();
 }
 
 } // namespace
@@ skipping 23 matching lines @@
     return startCryptoOperation(rawAlgorithm, key, Verify, signature, data, es);
 }
 
 ScriptObject SubtleCrypto::digest(const Dictionary& rawAlgorithm, ArrayBufferView* data, ExceptionState& es)
 {
     return startCryptoOperation(rawAlgorithm, 0, Digest, 0, data, es);
 }
 
 ScriptObject SubtleCrypto::generateKey(const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
 {
-    WebKit::WebCrypto* platformCrypto = WebKit::Platform::current()->crypto();
-    if (!platformCrypto) {
-        es.throwDOMException(NotSupportedError);
-        return ScriptObject();
-    }
-
     WebKit::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
         return ScriptObject();
 
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, GenerateKey, algorithm, es))
         return ScriptObject();
 
     RefPtr<CryptoResult> result = CryptoResult::create();
-    platformCrypto->generateKey(algorithm, extractable, keyUsages, result->result());
+    WebKit::Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
     return result->promise();
 }
 
 ScriptObject SubtleCrypto::importKey(const String& rawFormat, ArrayBufferView* keyData, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages, ExceptionState& es)
 {
-    WebKit::WebCrypto* platformCrypto = WebKit::Platform::current()->crypto();
-    if (!platformCrypto) {
-        es.throwDOMException(NotSupportedError);
-        return ScriptObject();
-    }
-
     WebKit::WebCryptoKeyFormat format;
     if (!Key::parseFormat(rawFormat, format, es))
         return ScriptObject();
 
     if (!keyData) {
         es.throwTypeError("Invalid keyData argument");
         return ScriptObject();
     }
 
     WebKit::WebCryptoKeyUsageMask keyUsages;
     if (!Key::parseUsageMask(rawKeyUsages, keyUsages, es))
         return ScriptObject();
 
     WebKit::WebCryptoAlgorithm algorithm;
     if (!normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, es))
         return ScriptObject();
 
     const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->baseAddress());
 
     RefPtr<CryptoResult> result = CryptoResult::create();
-    platformCrypto->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result());
+    WebKit::Platform::current()->crypto()->importKey(format, keyDataBytes, keyData->byteLength(), algorithm, extractable, keyUsages, result->result());
     return result->promise();
 }
 
 } // namespace WebCore