Cleanup: remove WebCryptoResultPrivate from blink API.

public/platform/WebCrypto.h

 /*
  * Copyright (C) 2013 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
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebCrypto_h
 #define WebCrypto_h
 
 #include "WebCommon.h"
 #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 PassRefPtr<> and an out-of-line
c'tor.  See for instance
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit....
you should probably also move this down to be lower in the header since someone
trying to understand how to use this interface probably isn't as interested in
the implementation details

[eroman, 2013/08/27 19:00:06]

Done.

+#endif
 
     WebCryptoResult(const WebCryptoResult& o)
     {
         assign(o);
     }
 
     ~WebCryptoResult()
     {
         reset();
     }
 
     WebCryptoResult& operator=(const WebCryptoResult& o)
     {
         assign(o);
         return *this;
     }
 
     WEBKIT_EXPORT void completeWithError();
     WEBKIT_EXPORT void completeWithBuffer(const WebArrayBuffer&);
     WEBKIT_EXPORT void completeWithBuffer(const void*, size_t);
     WEBKIT_EXPORT void completeWithBoolean(bool);
     WEBKIT_EXPORT void completeWithKey(const WebCryptoKey&);
 
 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 {
 public:
     // FIXME: Deprecated, delete once chromium side is updated.
     virtual WebCryptoOperation* digest(const WebCryptoAlgorithm&) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
 
     // Starts a one-shot cryptographic operation which can complete either
     // synchronously, or asynchronously.
     //
     // Let the WebCryptoResult be called "result".
     //
     // The result should be set exactly once, from the same thread which
     // initiated the operation.
     virtual void encrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, size_t data_size, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void decrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, size_t data_size, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void sign(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, size_t data_size, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void verifySignature(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* signature, size_t signature_size, const unsigned char* data, size_t data_size, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void digest(const WebCryptoAlgorithm&, const unsigned char* data, size_t data_size, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void generateKey(const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual void importKey(WebCryptoKeyFormat, const unsigned char* keyData, size_t keyDataSize, const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult) { WEBKIT_ASSERT_NOT_REACHED(); }
 
 protected:
     virtual ~WebCrypto() { }
 };
 
 } // namespace WebKit
 
 #endif