third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp - Issue 1541013002: Remove config.h inclusion from third_party/WebKit/Source/modules/[a-i]*/.

Side by Side Diff: third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp

Issue 1541013002: Remove config.h inclusion from third_party/WebKit/Source/modules/[a-i]*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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 | « third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | third_party/WebKit/Source/modules/crypto/WorkerGlobalScopeCrypto.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 10 matching lines...) Expand all Loading...
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT	21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,	22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT	23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,	24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

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"

32 #include "modules/crypto/SubtleCrypto.h"	31 #include "modules/crypto/SubtleCrypto.h"

33	32

34 #include "bindings/core/v8/Dictionary.h"	33 #include "bindings/core/v8/Dictionary.h"

35 #include "core/dom/ExecutionContext.h"	34 #include "core/dom/ExecutionContext.h"

36 #include "modules/crypto/CryptoHistograms.h"	35 #include "modules/crypto/CryptoHistograms.h"

37 #include "modules/crypto/CryptoKey.h"	36 #include "modules/crypto/CryptoKey.h"

38 #include "modules/crypto/CryptoResultImpl.h"	37 #include "modules/crypto/CryptoResultImpl.h"

39 #include "modules/crypto/NormalizeAlgorithm.h"	38 #include "modules/crypto/NormalizeAlgorithm.h"

40 #include "platform/JSONValues.h"	39 #include "platform/JSONValues.h"

41 #include "public/platform/Platform.h"	40 #include "public/platform/Platform.h"

(...skipping 378 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
420 if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationGetKeyLength, keyLe ngthAlgorithm, result))	419 if (!parseAlgorithm(rawDerivedKeyType, WebCryptoOperationGetKeyLength, keyLe ngthAlgorithm, result))

421 return promise;	420 return promise;

422	421

423 histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, baseKey ->key());	422 histogramAlgorithmAndKey(scriptState->executionContext(), algorithm, baseKey ->key());

424 histogramAlgorithm(scriptState->executionContext(), importAlgorithm);	423 histogramAlgorithm(scriptState->executionContext(), importAlgorithm);

425 Platform::current()->crypto()->deriveKey(algorithm, baseKey->key(), importAl gorithm, keyLengthAlgorithm, extractable, keyUsages, result->result());	424 Platform::current()->crypto()->deriveKey(algorithm, baseKey->key(), importAl gorithm, keyLengthAlgorithm, extractable, keyUsages, result->result());

426 return promise;	425 return promise;

427 }	426 }

428	427

429 } // namespace blink	428 } // namespace blink

OLD	NEW