[bindings] Remove custom binding usage from CryptoKey.idl

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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/core/v8/ExceptionState.h"
+#include "bindings/core/v8/V8Uint8Array.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/CryptoResult.h"
 #include "public/platform/WebCryptoAlgorithmParams.h"
 #include "public/platform/WebCryptoKeyAlgorithm.h"
 #include "public/platform/WebString.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 44 matching lines @@
 
 WebCryptoKeyUsageMask keyUsageStringToMask(const String& usageString)
 {
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(keyUsageMappings); ++i) {
         if (keyUsageMappings[i].name == usageString)
             return keyUsageMappings[i].value;
     }
     return 0;
 }
 
+class DictionaryBuilder : public blink::WebCryptoKeyAlgorithmDictionary {
+public:
+    DictionaryBuilder(ScriptState* scriptState)

[haraken, 2015/03/09 04:13:44]

Add explicit.

+        : m_scriptState(scriptState)
+        , m_dictionary(Dictionary::createEmpty(scriptState->isolate()))
+    {
+    }
+
+    virtual void setString(const char* propertyName, const char* value)
+    {
+        m_dictionary.set(propertyName, value);
+    }
+
+    virtual void setUint(const char* propertyName, unsigned value)
+    {
+        m_dictionary.set(propertyName, value);
+    }
+
+    virtual void setAlgorithm(const char* propertyName, const blink::WebCryptoAlgorithm& algorithm)
+    {
+        ASSERT(algorithm.paramsType() == blink::WebCryptoAlgorithmParamsTypeNone);
+
+        Dictionary algorithmValue = Dictionary::createEmpty(m_scriptState->isolate());
+        algorithmValue.set("name", blink::WebCryptoAlgorithm::lookupAlgorithmInfo(algorithm.id())->name);
+        m_dictionary.set(propertyName, algorithmValue);
+    }
+
+    virtual void setUint8Array(const char* propertyName, const blink::WebVector<unsigned char>& vector)
+    {
+        m_dictionary.set(propertyName, toV8(DOMUint8Array::create(vector.data(), vector.size()), m_scriptState->context()->Global(), m_scriptState->isolate()));
+    }
+
+    const Dictionary& dictionary() const { return m_dictionary; }
+
+private:
+    ScriptState* m_scriptState;

[haraken, 2015/03/09 04:13:44]

Not related to your CL, a safer way to use a ScriptState is to hold it using a
RefPtr. (In this particular case, a raw pointer would be OK because the
DictionaryBuilder is used only on stack.)

ScriptState* => RefPtr<ScriptState>

+    Dictionary m_dictionary;
+};
+
 } // namespace
 
 CryptoKey::~CryptoKey()
 {
 }
 
 CryptoKey::CryptoKey(const WebCryptoKey& key)
     : m_key(key)
 {
 }
 
 String CryptoKey::type() const
 {
     return keyTypeToString(m_key.type());
 }
 
 bool CryptoKey::extractable() const
 {
     return m_key.extractable();
 }
 
+ScriptValue CryptoKey::algorithm(ScriptState* scriptState)
+{
+    DictionaryBuilder builder(scriptState);
+    m_key.algorithm().writeToDictionary(&builder);
+    return ScriptValue(scriptState, builder.dictionary().v8Value());
+}
+
 // 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) {
         WebCryptoKeyUsage usage = keyUsageMappings[i].value;
         if (m_key.usages() & usage)
@@ skipping 49 matching lines @@
         if (!usage) {
             result->completeWithError(WebCryptoErrorTypeType, "Invalid keyUsages argument");
             return false;
         }
         mask |= usage;
     }
     return true;
 }
 
 } // namespace blink