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

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

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tidy unit tests Created 5 years, 5 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
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // The thread on which CryptoResultImpl was created on is referred to as the 48 // The thread on which CryptoResultImpl was created on is referred to as the
49 // "origin thread". 49 // "origin thread".
50 // 50 //
51 // * At creation time there must be an active ExecutionContext. 51 // * At creation time there must be an active ExecutionContext.
52 // * The CryptoResult interface must only be called from the origin thread. 52 // * The CryptoResult interface must only be called from the origin thread.
53 // * ref(), deref(), cancelled() and cancel() can be called from any thread. 53 // * ref(), deref(), cancelled() and cancel() 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 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; 68 bool cancelled() const override;
69 69
70 // If called after completion (including cancellation) will return an empty 70 // If called after completion (including cancellation) will return an empty
71 // ScriptPromise. 71 // ScriptPromise.
72 ScriptPromise promise(); 72 ScriptPromise promise();
73 73
74 DECLARE_VIRTUAL_TRACE();
75
74 private: 76 private:
75 class Resolver; 77 class Resolver;
76 explicit CryptoResultImpl(ScriptState*); 78 explicit CryptoResultImpl(ScriptState*);
77 79
78 void clearResolver(); 80 void clearResolver();
79 void cancel(); 81 void cancel();
80 82
81 // FIXME: ScriptPromiseResolver should not be exported. 83 Member<Resolver> m_resolver;
82 // Instead, use ScriptPromise.
83 ScriptPromiseResolver* m_resolver;
84 volatile int m_cancelled; 84 volatile int m_cancelled;
85 }; 85 };
86 86
87 } // namespace blink 87 } // namespace blink
88 88
89 #endif 89 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698