Chromium Code Reviews| Index: Source/modules/crypto/HmacKeyAlgorithm.cpp |
| diff --git a/Source/modules/crypto/Algorithm.cpp b/Source/modules/crypto/HmacKeyAlgorithm.cpp |
| similarity index 72% |
| copy from Source/modules/crypto/Algorithm.cpp |
| copy to Source/modules/crypto/HmacKeyAlgorithm.cpp |
| index f3cc089a18e78eb9944fc5dcb88a638aa1a811c3..5d42b817f645488637f81a2878ea7372e33f32c8 100644 |
| --- a/Source/modules/crypto/Algorithm.cpp |
| +++ b/Source/modules/crypto/HmacKeyAlgorithm.cpp |
| @@ -1,5 +1,5 @@ |
| /* |
| - * Copyright (C) 2013 Google Inc. All rights reserved. |
| + * Copyright (C) 2014 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 |
| @@ -29,29 +29,35 @@ |
| */ |
| #include "config.h" |
| -#include "modules/crypto/Algorithm.h" |
| +#include "modules/crypto/HmacKeyAlgorithm.h" |
| #include "modules/crypto/NormalizeAlgorithm.h" |
| #include "wtf/text/WTFString.h" |
| namespace WebCore { |
| -DEFINE_GC_INFO(Algorithm); |
| +PassRefPtrWillBeRawPtr<HmacKeyAlgorithm> HmacKeyAlgorithm::create(const blink::WebCryptoKeyAlgorithm& algorithm) |
| +{ |
| + return adoptRefWillBeNoop(new HmacKeyAlgorithm(algorithm)); |
| +} |
| -PassRefPtrWillBeRawPtr<Algorithm> Algorithm::create(const blink::WebCryptoAlgorithm& algorithm) |
| +KeyAlgorithm* HmacKeyAlgorithm::hash() |
| { |
| - return adoptRefWillBeNoop(new Algorithm(algorithm)); |
| + if (!m_hash) |
| + m_hash = KeyAlgorithm::createHash(m_algorithm.hmacParams()->hash()); |
| + return m_hash.get(); |
| } |
| -Algorithm::Algorithm(const blink::WebCryptoAlgorithm& algorithm) |
| - : m_algorithm(algorithm) |
| +void HmacKeyAlgorithm::trace(Visitor* visitor) |
|
abarth-chromium
2014/02/25 07:51:41
This one is needed. :)
|
| { |
| - ScriptWrappable::init(this); |
| + KeyAlgorithm::trace(visitor); |
| + visitor->trace(m_hash); |
| } |
| -String Algorithm::name() |
| +HmacKeyAlgorithm::HmacKeyAlgorithm(const blink::WebCryptoKeyAlgorithm& algorithm) |
| + : KeyAlgorithm(algorithm) |
| { |
| - return algorithmIdToName(m_algorithm.id()); |
| + ScriptWrappable::init(this); |
| } |
| } // namespace WebCore |