projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
modules
/
crypto
/
KeyPair.cpp
diff --git
a/src/third_party/WebKit/Source/modules/crypto/KeyPair.cpp
b/src/third_party/WebKit/Source/modules/crypto/KeyPair.cpp
index
6beaf2b
..
66dfecc
100644
(file)
--- a/
src/third_party/WebKit/Source/modules/crypto/KeyPair.cpp
+++ b/
src/third_party/WebKit/Source/modules/crypto/KeyPair.cpp
@@
-36,14
+36,16
@@
namespace WebCore {
namespace WebCore {
-PassRefPtr<KeyPair> KeyPair::create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey)
+DEFINE_GC_INFO(KeyPair);
+
+PassRefPtrWillBeRawPtr<KeyPair> KeyPair::create(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey)
{
ASSERT(publicKey.type() == blink::WebCryptoKeyTypePublic);
ASSERT(privateKey.type() == blink::WebCryptoKeyTypePrivate);
{
ASSERT(publicKey.type() == blink::WebCryptoKeyTypePublic);
ASSERT(privateKey.type() == blink::WebCryptoKeyTypePrivate);
- return adoptRef(new KeyPair(Key::create(publicKey), Key::create(privateKey)));
+ return adoptRef
WillBeNoop
(new KeyPair(Key::create(publicKey), Key::create(privateKey)));
}
}
-KeyPair::KeyPair(const PassRefPtr
<Key>& publicKey, const PassRef
Ptr<Key>& privateKey)
+KeyPair::KeyPair(const PassRefPtr
WillBeRawPtr<Key>& publicKey, const PassRefPtrWillBeRaw
Ptr<Key>& privateKey)
: m_publicKey(publicKey)
, m_privateKey(privateKey)
{
: m_publicKey(publicKey)
, m_privateKey(privateKey)
{
@@
-52,4
+54,10
@@
KeyPair::KeyPair(const PassRefPtr<Key>& publicKey, const PassRefPtr<Key>& privat
ScriptWrappable::init(this);
}
ScriptWrappable::init(this);
}
+void KeyPair::trace(Visitor* visitor)
+{
+ visitor->trace(m_publicKey);
+ visitor->trace(m_privateKey);
+}
+
} // namespace WebCore
} // namespace WebCore