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

Side by Side Diff: content/renderer/webcrypto/webcrypto_impl.cc

Issue 182073002: [webcrypto] Remove code conditional on !defined(WEBCRYPTO_HAS_KEY_ALGORITHM). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/webcrypto/webcrypto_impl.h" 5 #include "content/renderer/webcrypto/webcrypto_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/webcrypto/crypto_data.h" 8 #include "content/renderer/webcrypto/crypto_data.h"
9 #include "content/renderer/webcrypto/shared_crypto.h" 9 #include "content/renderer/webcrypto/shared_crypto.h"
10 #include "content/renderer/webcrypto/webcrypto_util.h" 10 #include "content/renderer/webcrypto/webcrypto_util.h"
11 #include "third_party/WebKit/public/platform/WebString.h" 11 #include "third_party/WebKit/public/platform/WebString.h"
12 #ifdef WEBCRYPTO_HAS_KEY_ALGORITHM
13 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" 12 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
14 #endif
15 13
16 namespace content { 14 namespace content {
17 15
18 using webcrypto::Status; 16 using webcrypto::Status;
19 17
20 namespace { 18 namespace {
21 19
22 void CompleteWithError(const Status& status, blink::WebCryptoResult* result) { 20 void CompleteWithError(const Status& status, blink::WebCryptoResult* result) {
23 DCHECK(status.IsError()); 21 DCHECK(status.IsError());
24 if (status.HasErrorDetails()) 22 if (status.HasErrorDetails())
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 unsigned int data_size, 201 unsigned int data_size,
204 blink::WebArrayBuffer& result) { 202 blink::WebArrayBuffer& result) {
205 blink::WebCryptoAlgorithm algorithm = 203 blink::WebCryptoAlgorithm algorithm =
206 blink::WebCryptoAlgorithm::adoptParamsAndCreate(algorithm_id, NULL); 204 blink::WebCryptoAlgorithm::adoptParamsAndCreate(algorithm_id, NULL);
207 return (webcrypto::Digest( 205 return (webcrypto::Digest(
208 algorithm, webcrypto::CryptoData(data, data_size), &result)) 206 algorithm, webcrypto::CryptoData(data, data_size), &result))
209 .IsSuccess(); 207 .IsSuccess();
210 } 208 }
211 209
212 } // namespace content 210 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/webcrypto/shared_crypto_unittest.cc ('k') | content/renderer/webcrypto/webcrypto_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698