Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / crypto / KeyPair.h

diff --git a/src/third_party/WebKit/Source/modules/crypto/KeyPair.h b/src/third_party/WebKit/Source/modules/crypto/KeyPair.h
index 292c31a..788d2de 100644 (file)
--- a/src/third_party/WebKit/Source/modules/crypto/KeyPair.h
+++ b/src/third_party/WebKit/Source/modules/crypto/KeyPair.h
@@ -32,7 +32,7 @@
 #define KeyPair_h
 
 #include "bindings/v8/ScriptWrappable.h"
-#include "heap/Handle.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
@@ -43,20 +43,20 @@ namespace WebCore {
 
 class Key;
 
-class KeyPair : public RefCountedWillBeGarbageCollectedFinalized<KeyPair>, public ScriptWrappable {
+class KeyPair : public GarbageCollectedFinalized<KeyPair>, public ScriptWrappable {
 public:
-    static PassRefPtrWillBeRawPtr<KeyPair> create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey);
+    static KeyPair* create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey);
 
-    Key* publicKey() { return m_publicKey.get(); }
-    Key* privateKey() { return m_privateKey.get(); }
+    Key* publicKey() { return m_publicKey; }
+    Key* privateKey() { return m_privateKey; }
 
     void trace(Visitor*);
 
 protected:
-    KeyPair(const PassRefPtrWillBeRawPtr<Key>& publicKey, const PassRefPtrWillBeRawPtr<Key>& privateKey);
+    KeyPair(Key* publicKey, Key* privateKey);
 
-    RefPtrWillBeMember<Key> m_publicKey;
-    RefPtrWillBeMember<Key> m_privateKey;
+    Member<Key> m_publicKey;
+    Member<Key> m_privateKey;
 };
 
 } // namespace WebCore