OLD | NEW |
---|---|
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 22 matching lines...) Expand all Loading... | |
33 | 33 |
34 #include "bindings/core/v8/ScriptPromise.h" | 34 #include "bindings/core/v8/ScriptPromise.h" |
35 #include "core/dom/ExceptionCode.h" | 35 #include "core/dom/ExceptionCode.h" |
36 #include "modules/ModulesExport.h" | 36 #include "modules/ModulesExport.h" |
37 #include "platform/CryptoResult.h" | 37 #include "platform/CryptoResult.h" |
38 #include "public/platform/WebCrypto.h" | 38 #include "public/platform/WebCrypto.h" |
39 #include "wtf/Forward.h" | 39 #include "wtf/Forward.h" |
40 | 40 |
41 namespace blink { | 41 namespace blink { |
42 | 42 |
43 class ScriptPromiseResolver; | |
44 MODULES_EXPORT ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType); | 43 MODULES_EXPORT ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType); |
45 | 44 |
46 // Wrapper around a Promise to notify completion of the crypto operation. | 45 // Wrapper around a Promise to notify completion of the crypto operation. |
47 // | 46 // |
48 // The thread on which CryptoResultImpl was created on is referred to as the | 47 // The thread on which CryptoResultImpl was created on is referred to as the |
49 // "origin thread". | 48 // "origin thread". |
50 // | 49 // |
51 // * At creation time there must be an active ExecutionContext. | 50 // * At creation time there must be an active ExecutionContext. |
52 // * The CryptoResult interface must only be called from the origin thread. | 51 // * The CryptoResult interface must only be called from the origin thread. |
53 // * ref(), deref(), cancelled() and cancel() can be called from any thread. | 52 // * cancel() can only be called from the origin thread. |
53 // * ref(), deref() can be called from any thread. | |
54 // * One of the completeWith***() functions must be called, or the | 54 // * One of the completeWith***() functions must be called, or the |
55 // m_resolver will be leaked until the ExecutionContext is destroyed. | 55 // m_resolver will be leaked until the ExecutionContext is destroyed. |
56 class CryptoResultImpl final : public CryptoResult { | 56 class CryptoResultImpl final : public CryptoResult { |
57 public: | 57 public: |
58 static PassRefPtrWillBeRawPtr<CryptoResultImpl> create(ScriptState*); | |
59 | |
58 ~CryptoResultImpl(); | 60 ~CryptoResultImpl(); |
59 | 61 |
60 static PassRefPtrWillBeRawPtr<CryptoResultImpl> create(ScriptState*); | |
61 | |
62 void completeWithError(WebCryptoErrorType, const WebString&) override; | 62 void completeWithError(WebCryptoErrorType, const WebString&) override; |
63 void completeWithBuffer(const void* bytes, unsigned bytesSize) override; | 63 void completeWithBuffer(const void* bytes, unsigned bytesSize) override; |
64 void completeWithJson(const char* utf8Data, unsigned length) override; | 64 void completeWithJson(const char* utf8Data, unsigned length) override; |
65 void completeWithBoolean(bool) override; | 65 void completeWithBoolean(bool) override; |
66 void completeWithKey(const WebCryptoKey&) override; | 66 void completeWithKey(const WebCryptoKey&) override; |
67 void completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey) override; | 67 void completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey) override; |
68 bool cancelled() const override; | |
69 | 68 |
70 // If called after completion (including cancellation) will return an empty | 69 // If called after completion (including cancellation) will return an empty |
71 // ScriptPromise. | 70 // ScriptPromise. |
72 ScriptPromise promise(); | 71 ScriptPromise promise(); |
73 | 72 |
73 WebCryptoResult result() | |
74 { | |
75 return WebCryptoResult(this); | |
76 } | |
77 | |
78 void assignedTo(WebCryptoResult*) override; | |
79 | |
80 DECLARE_VIRTUAL_TRACE(); | |
81 | |
74 private: | 82 private: |
75 class Resolver; | 83 class Resolver; |
76 explicit CryptoResultImpl(ScriptState*); | 84 explicit CryptoResultImpl(ScriptState*); |
77 | 85 |
78 void clearResolver(); | 86 void clearResolver(); |
79 void cancel(); | 87 void cancel(); |
80 | 88 |
81 // FIXME: ScriptPromiseResolver should not be exported. | 89 RawPtrWillBeMember<Resolver> m_resolver; |
82 // Instead, use ScriptPromise. | 90 |
83 ScriptPromiseResolver* m_resolver; | 91 // To reliably allow a WebCrypto-using execution context to shut down while |
84 volatile int m_cancelled; | 92 // crypto operations it has issued are still underway, keep track of the |
93 // WebCrypto reference that keeps each CryptoResultImpl alive. | |
94 // | |
95 // Should the execution context be stop()ped, this keep-alive reference is | |
96 // eagerly cancelled and cleared out. The execution context can then | |
97 // proceed and shut down tidily. | |
98 // | |
99 // When the corresponding crypto operation eventually completes, it'll | |
100 // notice the cancellation and act accordingly. | |
101 WebCryptoResult* m_resultOwner; | |
eroman
2015/07/15 21:34:06
This doesn't make sense.
WebCryptoResult is a cop
| |
85 }; | 102 }; |
86 | 103 |
87 } // namespace blink | 104 } // namespace blink |
88 | 105 |
89 #endif | 106 #endif // CryptoResultImpl_h |
OLD | NEW |