[webcrypto] Replace KeyAlgorithm interfaces with an Object.

Source/modules/crypto/CryptoKey.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/crypto/CryptoKey.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
-#include "modules/crypto/KeyAlgorithm.h"
 #include "platform/CryptoResult.h"
 #include "public/platform/WebCryptoAlgorithmParams.h"
+#include "public/platform/WebCryptoKeyAlgorithm.h"
 #include "public/platform/WebString.h"
 
 namespace WebCore {
 
 namespace {
 
 const char* keyTypeToString(blink::WebCryptoKeyType type)
 {
     switch (type) {
     case blink::WebCryptoKeyTypeSecret:
@@ skipping 91 matching lines @@
 String CryptoKey::type() const
 {
     return keyTypeToString(m_key.type());
 }
 
 bool CryptoKey::extractable() const
 {
     return m_key.extractable();
 }
 
-KeyAlgorithm* CryptoKey::algorithm()
-{
-    if (!m_algorithm)
-        m_algorithm = KeyAlgorithm::create(m_key.algorithm());
-    return m_algorithm.get();
-}
-
 // FIXME: This creates a new javascript array each time. What should happen
 //        instead is return the same (immutable) array. (Javascript callers can
 //        distinguish this by doing an == test on the arrays and seeing they are
 //        different).
 Vector<String> CryptoKey::usages() const
 {
     Vector<String> result;
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyUsageMappings); ++i) {
         blink::WebCryptoKeyUsage usage = keyUsageMappings[i].value;
         if (m_key.usages() & usage)
@@ skipping 48 matching lines @@
         blink::WebCryptoKeyUsageMask usage = keyUsageStringToMask(usages[i]);
         if (!usage) {
             result->completeWithError(blink::WebCryptoErrorTypeSyntax, "Invalid keyUsages argument");
             return false;
         }
         mask |= usage;
     }
     return true;
 }
 
-void CryptoKey::trace(Visitor* visitor)
-{
-    visitor->trace(m_algorithm);
-}
-
 } // namespace WebCore