Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "bindings/modules/v8/V8CryptoKey.h" | 6 #include "bindings/modules/v8/V8CryptoKey.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/Dictionary.h" | 8 #include "bindings/core/v8/Dictionary.h" |
| 9 #include "bindings/core/v8/V8Binding.h" | 9 #include "bindings/core/v8/V8Binding.h" |
| 10 #include "bindings/core/v8/custom/V8Uint8ArrayCustom.h" | 10 #include "bindings/core/v8/V8Uint8Array.h" |
| 11 #include "public/platform/WebCryptoKeyAlgorithm.h" | 11 #include "public/platform/WebCryptoKeyAlgorithm.h" |
| 12 #include "wtf/Uint8Array.h" | 12 #include "wtf/Uint8Array.h" |
| 13 | 13 |
| 14 namespace blink { | 14 namespace blink { |
| 15 | 15 |
| 16 class DictionaryBuilder : public blink::WebCryptoKeyAlgorithmDictionary { | 16 class DictionaryBuilder : public blink::WebCryptoKeyAlgorithmDictionary { |
| 17 public: | 17 public: |
| 18 DictionaryBuilder(v8::Handle<v8::Object> holder, v8::Isolate* isolate) | 18 DictionaryBuilder(v8::Handle<v8::Object> holder, v8::Isolate* isolate) |
| 19 : m_holder(holder) | 19 : m_holder(holder) |
| 20 , m_isolate(isolate) | 20 , m_isolate(isolate) |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 36 { | 36 { |
| 37 ASSERT(algorithm.paramsType() == blink::WebCryptoAlgorithmParamsTypeNone ); | 37 ASSERT(algorithm.paramsType() == blink::WebCryptoAlgorithmParamsTypeNone ); |
| 38 | 38 |
| 39 Dictionary algorithmValue = Dictionary::createEmpty(m_isolate); | 39 Dictionary algorithmValue = Dictionary::createEmpty(m_isolate); |
| 40 algorithmValue.set("name", blink::WebCryptoAlgorithm::lookupAlgorithmInf o(algorithm.id())->name); | 40 algorithmValue.set("name", blink::WebCryptoAlgorithm::lookupAlgorithmInf o(algorithm.id())->name); |
| 41 m_dictionary.set(propertyName, algorithmValue); | 41 m_dictionary.set(propertyName, algorithmValue); |
| 42 } | 42 } |
| 43 | 43 |
| 44 virtual void setUint8Array(const char* propertyName, const blink::WebVector< unsigned char>& vector) | 44 virtual void setUint8Array(const char* propertyName, const blink::WebVector< unsigned char>& vector) |
| 45 { | 45 { |
| 46 RefPtr<Uint8Array> uint8Array = Uint8Array::create(vector.data(), vector .size()); | 46 RefPtr<DOMUint8Array> uint8Array = DOMUint8Array::create(vector.data(), vector.size()); |
| 47 m_dictionary.set(propertyName, toV8(uint8Array.get(), m_holder, m_isolat e)); | 47 m_dictionary.set(propertyName, toV8(uint8Array.get(), m_holder, m_isolat e)); |
|
haraken
2014/10/16 05:41:41
uint8Array.get() => uint8Array.release()
or you c
Yuki
2014/10/16 14:21:50
Done.
| |
| 48 } | 48 } |
| 49 | 49 |
| 50 const Dictionary& dictionary() const { return m_dictionary; } | 50 const Dictionary& dictionary() const { return m_dictionary; } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 v8::Handle<v8::Object> m_holder; | 53 v8::Handle<v8::Object> m_holder; |
| 54 v8::Isolate* m_isolate; | 54 v8::Isolate* m_isolate; |
| 55 Dictionary m_dictionary; | 55 Dictionary m_dictionary; |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 void V8CryptoKey::algorithmAttributeGetterCustom(const v8::PropertyCallbackInfo< v8::Value>& info) | 58 void V8CryptoKey::algorithmAttributeGetterCustom(const v8::PropertyCallbackInfo< v8::Value>& info) |
| 59 { | 59 { |
| 60 CryptoKey* impl = V8CryptoKey::toImpl(info.Holder()); | 60 CryptoKey* impl = V8CryptoKey::toImpl(info.Holder()); |
| 61 | 61 |
| 62 DictionaryBuilder builder(info.Holder(), info.GetIsolate()); | 62 DictionaryBuilder builder(info.Holder(), info.GetIsolate()); |
| 63 impl->key().algorithm().writeToDictionary(&builder); | 63 impl->key().algorithm().writeToDictionary(&builder); |
| 64 | 64 |
| 65 v8SetReturnValue(info, builder.dictionary().v8Value()); | 65 v8SetReturnValue(info, builder.dictionary().v8Value()); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace blink | 68 } // namespace blink |
| OLD | NEW |