[webcrypto] exportKey() now returns dictionary when format='jwk' (CL 2 of 2).

Source/modules/crypto/CryptoResultImpl.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 98 matching lines @@
     if (m_resolver)
         m_resolver->reject(DOMException::create(webCryptoErrorToExceptionCode(errorType), errorDetails));
 }
 
 void CryptoResultImpl::completeWithBuffer(const blink::WebArrayBuffer& buffer)
 {
     if (m_resolver)
         m_resolver->resolve(PassRefPtr<ArrayBuffer>(buffer));
 }
 
+void CryptoResultImpl::completeWithJson(const char* utf8Data, unsigned length)
+{
+    if (m_resolver) {
+        ScriptState* scriptState = m_resolver->scriptState();
+        ScriptState::Scope scope(scriptState);
+
+        v8::Handle<v8::String> jsonString = v8AtomicString(scriptState->isolate(), utf8Data, length);

[abarth-chromium, 2014/06/17 05:03:05]

Why atomic?

[eroman, 2014/06/17 17:58:02]

Thanks for pointing this out!

I had a misunderstanding of what atomicstring was, thinking it worked similar to
an external string (and would avoid copying the input data here).

From what I can tell however, an atomic string is for de-duplicating frequently
used strings, and it has the side-effect of increasing the lifetime of those
strings. Which is definitely not what I want here.

I will switch to using v8::String::NewFromUtf8() instead, using kNormalString
and update shortly.

[eroman, 2014/06/17 18:06:56]

Done.

+
+        v8::TryCatch exceptionCatcher;
+        v8::Handle<v8::Value> jsonDictionary = v8::JSON::Parse(jsonString);
+        if (exceptionCatcher.HasCaught() || jsonDictionary.IsEmpty()) {
+            ASSERT_NOT_REACHED();
+            m_resolver->reject(DOMException::create(OperationError, "Failed inflating JWK JSON to object"));
+            return;
+        }
+
+        m_resolver->resolve(jsonDictionary);
+    }
+}
+
 void CryptoResultImpl::completeWithBoolean(bool b)
 {
     if (m_resolver)
         m_resolver->resolve(b);
 }
 
 void CryptoResultImpl::completeWithKey(const blink::WebCryptoKey& key)
 {
     if (m_resolver)
         m_resolver->resolve(Key::create(key));
 }
 
 void CryptoResultImpl::completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey)
 {
     if (m_resolver)
         m_resolver->resolve(KeyPair::create(publicKey, privateKey));
 }
 
 CryptoResultImpl::CryptoResultImpl(ScriptState* scriptState)
     : m_resolver(WeakResolver::create(scriptState))
 {
 }
 
 ScriptPromise CryptoResultImpl::promise()
 {
     return m_resolver->promise();
 }
 
 } // namespace WebCore