| Index: content/child/webcrypto/structured_clone.h
|
| diff --git a/content/child/webcrypto/jwk.h b/content/child/webcrypto/structured_clone.h
|
| similarity index 34%
|
| copy from content/child/webcrypto/jwk.h
|
| copy to content/child/webcrypto/structured_clone.h
|
| index c9191888256d957f56c00da4bebe970307cca9c3..19728f99c552d23a6012067954a479ce06786daf 100644
|
| --- a/content/child/webcrypto/jwk.h
|
| +++ b/content/child/webcrypto/structured_clone.h
|
| @@ -2,33 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_CHILD_WEBCRYPTO_JWK_H_
|
| -#define CONTENT_CHILD_WEBCRYPTO_JWK_H_
|
| -
|
| -#include <vector>
|
| +#ifndef CONTENT_CHILD_WEBCRYPTO_STRUCTURED_CLONE_H_
|
| +#define CONTENT_CHILD_WEBCRYPTO_STRUCTURED_CLONE_H_
|
|
|
| #include "base/basictypes.h"
|
| -#include "third_party/WebKit/public/platform/WebArrayBuffer.h"
|
| #include "third_party/WebKit/public/platform/WebCrypto.h"
|
| -#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
|
|
|
| namespace content {
|
|
|
| namespace webcrypto {
|
|
|
| class CryptoData;
|
| -class Status;
|
|
|
| -Status ImportKeyJwk(const CryptoData& key_data,
|
| - const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key);
|
| +// Called on the target Blink thread.
|
| +bool SerializeKeyForClone(const blink::WebCryptoKey& key,
|
| + blink::WebVector<uint8>* key_data);
|
|
|
| -Status ExportKeyJwk(const blink::WebCryptoKey& key, std::vector<uint8>* buffer);
|
| +// Called on the target Blink thread.
|
| +bool DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,
|
| + blink::WebCryptoKeyType type,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usage_mask,
|
| + const CryptoData& key_data,
|
| + blink::WebCryptoKey* key);
|
|
|
| } // namespace webcrypto
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_CHILD_WEBCRYPTO_JWK_H_
|
| +#endif // CONTENT_CHILD_WEBCRYPTO_STRUCTURED_CLONE_H_
|
|
|