Chromium Code Reviews| Index: public/platform/WebCrypto.h |
| diff --git a/public/platform/WebCrypto.h b/public/platform/WebCrypto.h |
| index 6b6f0a06c4b54a1d389248e5c0f556a0848ad553..20fc2da6742ef91eb98fc13fd38e4bf6455b8a6e 100644 |
| --- a/public/platform/WebCrypto.h |
| +++ b/public/platform/WebCrypto.h |
| @@ -35,31 +35,18 @@ |
| #include "WebCryptoKey.h" |
| #include "WebPrivatePtr.h" |
| +namespace WebCore { class CryptoResult; } |
| + |
| namespace WebKit { |
| class WebArrayBuffer; |
| class WebCryptoOperation; |
| -class WebCryptoResultPrivate { |
| -public: |
| - virtual void ref() = 0; |
| - virtual void deref() = 0; |
| - |
| - virtual void completeWithError() = 0; |
| - virtual void completeWithBuffer(const WebArrayBuffer&) = 0; |
| - virtual void completeWithBoolean(bool) = 0; |
| - virtual void completeWithKey(const WebCryptoKey&) = 0; |
| - |
| -protected: |
| - virtual ~WebCryptoResultPrivate() { } |
| -}; |
| - |
| class WebCryptoResult { |
| public: |
| - explicit WebCryptoResult(WebCryptoResultPrivate* impl) |
| - { |
| - assign(impl); |
| - } |
| +#if WEBKIT_IMPLEMENTATION |
| + explicit WebCryptoResult(WebCore::CryptoResult* impl) : m_impl(impl) { } |
|
jamesr
2013/08/24 02:02:26
nit: this is slightly more commonly done with Pass
eroman
2013/08/27 19:00:06
Done.
|
| +#endif |
| WebCryptoResult(const WebCryptoResult& o) |
| { |
| @@ -86,9 +73,8 @@ public: |
| private: |
| WEBKIT_EXPORT void reset(); |
| WEBKIT_EXPORT void assign(const WebCryptoResult&); |
| - WEBKIT_EXPORT void assign(WebCryptoResultPrivate*); |
| - WebPrivatePtr<WebCryptoResultPrivate> m_impl; |
| + WebPrivatePtr<WebCore::CryptoResult> m_impl; |
| }; |
| class WebCrypto { |