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

Side by Side Diff: Source/platform/exported/WebCryptoResult.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix webusb ScriptPromiseResolver usage Created 5 years, 4 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
« no previous file with comments | « Source/platform/CryptoResult.h ('k') | Source/platform/heap/Handle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "public/platform/WebCrypto.h" 32 #include "public/platform/WebCrypto.h"
33 33
34 #include "platform/CryptoResult.h" 34 #include "platform/CryptoResult.h"
35 #include "platform/heap/Heap.h" 35 #include "platform/heap/Handle.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS tring& errorDetails) 39 void WebCryptoResult::completeWithError(WebCryptoErrorType errorType, const WebS tring& errorDetails)
40 { 40 {
41 if (!cancelled()) 41 if (!cancelled())
42 m_impl->completeWithError(errorType, errorDetails); 42 m_impl->completeWithError(errorType, errorDetails);
43 reset(); 43 reset();
44 } 44 }
45 45
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 if (!cancelled()) 79 if (!cancelled())
80 m_impl->completeWithKeyPair(publicKey, privateKey); 80 m_impl->completeWithKeyPair(publicKey, privateKey);
81 reset(); 81 reset();
82 } 82 }
83 83
84 bool WebCryptoResult::cancelled() const 84 bool WebCryptoResult::cancelled() const
85 { 85 {
86 return m_cancel->cancelled(); 86 return m_cancel->cancelled();
87 } 87 }
88 88
89 WebCryptoResult::WebCryptoResult(const PassRefPtrWillBeRawPtr<CryptoResult>& imp l, const PassRefPtr<CryptoResultCancel>& cancel) 89 WebCryptoResult::WebCryptoResult(CryptoResult* impl, const PassRefPtr<CryptoResu ltCancel>& cancel)
90 : m_impl(impl) 90 : m_impl(impl)
91 , m_cancel(cancel) 91 , m_cancel(cancel)
92 { 92 {
93 ASSERT(m_impl.get()); 93 ASSERT(m_impl.get());
94 ASSERT(m_cancel.get()); 94 ASSERT(m_cancel.get());
95 } 95 }
96 96
97 void WebCryptoResult::reset() 97 void WebCryptoResult::reset()
98 { 98 {
99 m_impl.reset(); 99 m_impl.reset();
100 m_cancel.reset(); 100 m_cancel.reset();
101 } 101 }
102 102
103 void WebCryptoResult::assign(const WebCryptoResult& o) 103 void WebCryptoResult::assign(const WebCryptoResult& o)
104 { 104 {
105 m_impl = o.m_impl; 105 m_impl = o.m_impl;
106 m_cancel = o.m_cancel; 106 m_cancel = o.m_cancel;
107 } 107 }
108 108
109 } // namespace blink 109 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/CryptoResult.h ('k') | Source/platform/heap/Handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698