| Index: Source/core/platform/chromium/support/WebCryptoAlgorithm.cpp
|
| diff --git a/Source/core/platform/chromium/support/WebCryptoAlgorithm.cpp b/Source/core/platform/chromium/support/WebCryptoAlgorithm.cpp
|
| index fe8ff81ecfc897438587f9898149ce99037543d7..1bdd81b7ce0d375a8992238bd9c98990752ef2f9 100644
|
| --- a/Source/core/platform/chromium/support/WebCryptoAlgorithm.cpp
|
| +++ b/Source/core/platform/chromium/support/WebCryptoAlgorithm.cpp
|
| @@ -39,36 +39,34 @@ namespace WebKit {
|
|
|
| class WebCryptoAlgorithmPrivate : public ThreadSafeRefCounted<WebCryptoAlgorithmPrivate> {
|
| public:
|
| - WebCryptoAlgorithmPrivate(WebCryptoAlgorithmId id, const char* name, PassOwnPtr<WebCryptoAlgorithmParams> params)
|
| + WebCryptoAlgorithmPrivate(WebCryptoAlgorithmId id, PassOwnPtr<WebCryptoAlgorithmParams> params)
|
| : id(id)
|
| - , name(name)
|
| , params(params)
|
| {
|
| }
|
|
|
| WebCryptoAlgorithmId id;
|
| - const char* const name;
|
| OwnPtr<WebCryptoAlgorithmParams> params;
|
| };
|
|
|
| -WebCryptoAlgorithm::WebCryptoAlgorithm(WebCryptoAlgorithmId id, const char* name, PassOwnPtr<WebCryptoAlgorithmParams> params)
|
| - : m_private(adoptRef(new WebCryptoAlgorithmPrivate(id, name, params)))
|
| +WebCryptoAlgorithm::WebCryptoAlgorithm(WebCryptoAlgorithmId id, PassOwnPtr<WebCryptoAlgorithmParams> params)
|
| + : m_private(adoptRef(new WebCryptoAlgorithmPrivate(id, params)))
|
| {
|
| }
|
|
|
| -WebCryptoAlgorithm WebCryptoAlgorithm::adoptParamsAndCreate(WebCryptoAlgorithmId id, const char* name, WebCryptoAlgorithmParams* params)
|
| +WebCryptoAlgorithm WebCryptoAlgorithm::adoptParamsAndCreate(WebCryptoAlgorithmId id, const char*, WebCryptoAlgorithmParams* params)
|
| {
|
| - return WebCryptoAlgorithm(id, name, adoptPtr(params));
|
| + return WebCryptoAlgorithm(id, adoptPtr(params));
|
| }
|
|
|
| -WebCryptoAlgorithmId WebCryptoAlgorithm::id() const
|
| +WebCryptoAlgorithm WebCryptoAlgorithm::adoptParamsAndCreate(WebCryptoAlgorithmId id, WebCryptoAlgorithmParams* params)
|
| {
|
| - return m_private->id;
|
| + return WebCryptoAlgorithm(id, adoptPtr(params));
|
| }
|
|
|
| -const char* WebCryptoAlgorithm::name() const
|
| +WebCryptoAlgorithmId WebCryptoAlgorithm::id() const
|
| {
|
| - return m_private->name;
|
| + return m_private->id;
|
| }
|
|
|
| WebCryptoAlgorithmParamsType WebCryptoAlgorithm::paramsType() const
|
|
|