Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Side by Side Diff: Source/modules/crypto/CryptoResultImpl.h

Issue 338993002: [webcrypto] exportKey() now returns dictionary when format='jwk' (CL 2 of 2). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix rsa-oaep-key-manipulation.html Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // * One of the completeWith***() functions must be called, or the 53 // * One of the completeWith***() functions must be called, or the
54 // PromiseState will be leaked until the ExecutionContext is destroyed. 54 // PromiseState will be leaked until the ExecutionContext is destroyed.
55 class CryptoResultImpl FINAL : public CryptoResult { 55 class CryptoResultImpl FINAL : public CryptoResult {
56 public: 56 public:
57 ~CryptoResultImpl(); 57 ~CryptoResultImpl();
58 58
59 static PassRefPtr<CryptoResultImpl> create(ScriptState*); 59 static PassRefPtr<CryptoResultImpl> create(ScriptState*);
60 60
61 virtual void completeWithError(blink::WebCryptoErrorType, const blink::WebSt ring&) OVERRIDE; 61 virtual void completeWithError(blink::WebCryptoErrorType, const blink::WebSt ring&) OVERRIDE;
62 virtual void completeWithBuffer(const blink::WebArrayBuffer&) OVERRIDE; 62 virtual void completeWithBuffer(const blink::WebArrayBuffer&) OVERRIDE;
63 virtual void completeWithJson(const char* utf8Data, unsigned length) OVERRID E;
63 virtual void completeWithBoolean(bool) OVERRIDE; 64 virtual void completeWithBoolean(bool) OVERRIDE;
64 virtual void completeWithKey(const blink::WebCryptoKey&) OVERRIDE; 65 virtual void completeWithKey(const blink::WebCryptoKey&) OVERRIDE;
65 virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE; 66 virtual void completeWithKeyPair(const blink::WebCryptoKey& publicKey, const blink::WebCryptoKey& privateKey) OVERRIDE;
66 67
67 // It is only valid to call this before completion. 68 // It is only valid to call this before completion.
68 ScriptPromise promise(); 69 ScriptPromise promise();
69 70
70 private: 71 private:
71 explicit CryptoResultImpl(ScriptState*); 72 explicit CryptoResultImpl(ScriptState*);
72 73
73 class PromiseState; 74 class PromiseState;
74 WeakPtr<PromiseState> m_promiseState; 75 WeakPtr<PromiseState> m_promiseState;
75 }; 76 };
76 77
77 } // namespace WebCore 78 } // namespace WebCore
78 79
79 #endif 80 #endif
OLDNEW
« no previous file with comments | « LayoutTests/crypto/rsa-oaep-key-manipulation.html ('k') | Source/modules/crypto/CryptoResultImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698