| Index: Source/modules/crypto/CryptoOperation.cpp
|
| diff --git a/Source/modules/crypto/CryptoOperation.cpp b/Source/modules/crypto/CryptoOperation.cpp
|
| index a3a9fd7495cafe35784db42593cf357e61d833d9..dff9858af591a68d2da390252f04b337be0114f7 100644
|
| --- a/Source/modules/crypto/CryptoOperation.cpp
|
| +++ b/Source/modules/crypto/CryptoOperation.cpp
|
| @@ -31,30 +31,10 @@
|
| #include "config.h"
|
| #include "modules/crypto/CryptoOperation.h"
|
|
|
| -#include "modules/crypto/AesCbcParams.h"
|
| -#include "modules/crypto/AesKeyGenParams.h"
|
| #include "modules/crypto/Algorithm.h"
|
|
|
| namespace WebCore {
|
|
|
| -namespace {
|
| -
|
| -PassRefPtr<Algorithm> createAlgorithm(const WebKit::WebCryptoAlgorithm& algorithm)
|
| -{
|
| - switch (algorithm.paramsType()) {
|
| - case WebKit::WebCryptoAlgorithmParamsTypeNone:
|
| - return Algorithm::create(algorithm);
|
| - case WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams:
|
| - return AesCbcParams::create(algorithm);
|
| - case WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams:
|
| - return AesKeyGenParams::create(algorithm);
|
| - }
|
| - ASSERT_NOT_REACHED();
|
| - return 0;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| CryptoOperation::CryptoOperation(const WebKit::WebCryptoAlgorithm& algorithm)
|
| : m_algorithm(algorithm)
|
| {
|
| @@ -64,7 +44,7 @@ CryptoOperation::CryptoOperation(const WebKit::WebCryptoAlgorithm& algorithm)
|
| Algorithm* CryptoOperation::algorithm()
|
| {
|
| if (!m_algorithmNode)
|
| - m_algorithmNode = createAlgorithm(m_algorithm);
|
| + m_algorithmNode = Algorithm::create(m_algorithm);
|
| return m_algorithmNode.get();
|
| }
|
|
|
|
|