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

Side by Side Diff: Source/core/platform/chromium/support/WebCryptoKey.cpp

Issue 18801015: WebCrypto: Update the key usage names to reflect recent changes to the spec. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/modules/crypto/Key.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 21 matching lines...) Expand all
32 #include "public/platform/WebCryptoKey.h" 32 #include "public/platform/WebCryptoKey.h"
33 33
34 #include "public/platform/WebCryptoAlgorithm.h" 34 #include "public/platform/WebCryptoAlgorithm.h"
35 #include "wtf/OwnPtr.h" 35 #include "wtf/OwnPtr.h"
36 #include "wtf/ThreadSafeRefCounted.h" 36 #include "wtf/ThreadSafeRefCounted.h"
37 37
38 namespace WebKit { 38 namespace WebKit {
39 39
40 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> { 40 class WebCryptoKeyPrivate : public ThreadSafeRefCounted<WebCryptoKeyPrivate> {
41 public: 41 public:
42 WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMa sk keyUsage) 42 WebCryptoKeyPrivate(PassOwnPtr<WebCryptoKeyHandle> handle, WebCryptoKeyType type, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMa sk usages)
43 : handle(handle) 43 : handle(handle)
44 , type(type) 44 , type(type)
45 , extractable(extractable) 45 , extractable(extractable)
46 , algorithm(algorithm) 46 , algorithm(algorithm)
47 , keyUsage(keyUsage) 47 , usages(usages)
48 { 48 {
49 } 49 }
50 50
51 const OwnPtr<WebCryptoKeyHandle> handle; 51 const OwnPtr<WebCryptoKeyHandle> handle;
52 const WebCryptoKeyType type; 52 const WebCryptoKeyType type;
53 const bool extractable; 53 const bool extractable;
54 const WebCryptoAlgorithm algorithm; 54 const WebCryptoAlgorithm algorithm;
55 const WebCryptoKeyUsageMask keyUsage; 55 const WebCryptoKeyUsageMask usages;
56 }; 56 };
57 57
58 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMas k keyUsage) 58 WebCryptoKey WebCryptoKey::create(WebCryptoKeyHandle* handle, WebCryptoKeyType t ype, bool extractable, const WebCryptoAlgorithm& algorithm, WebCryptoKeyUsageMas k usages)
59 { 59 {
60 WebCryptoKey key; 60 WebCryptoKey key;
61 key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, ext ractable, algorithm, keyUsage)); 61 key.m_private = adoptRef(new WebCryptoKeyPrivate(adoptPtr(handle), type, ext ractable, algorithm, usages));
62 return key; 62 return key;
63 } 63 }
64 64
65 WebCryptoKeyHandle* WebCryptoKey::handle() const 65 WebCryptoKeyHandle* WebCryptoKey::handle() const
66 { 66 {
67 return m_private->handle.get(); 67 return m_private->handle.get();
68 } 68 }
69 69
70 WebCryptoKeyType WebCryptoKey::type() const 70 WebCryptoKeyType WebCryptoKey::type() const
71 { 71 {
72 return m_private->type; 72 return m_private->type;
73 } 73 }
74 74
75 bool WebCryptoKey::extractable() const 75 bool WebCryptoKey::extractable() const
76 { 76 {
77 return m_private->extractable; 77 return m_private->extractable;
78 } 78 }
79 79
80 const WebCryptoAlgorithm& WebCryptoKey::algorithm() const 80 const WebCryptoAlgorithm& WebCryptoKey::algorithm() const
81 { 81 {
82 return m_private->algorithm; 82 return m_private->algorithm;
83 } 83 }
84 84
85 WebCryptoKeyUsageMask WebCryptoKey::keyUsage() const 85 WebCryptoKeyUsageMask WebCryptoKey::usages() const
86 { 86 {
87 return m_private->keyUsage; 87 return m_private->usages;
88 } 88 }
89 89
90 void WebCryptoKey::assign(const WebCryptoKey& other) 90 void WebCryptoKey::assign(const WebCryptoKey& other)
91 { 91 {
92 m_private = other.m_private; 92 m_private = other.m_private;
93 } 93 }
94 94
95 void WebCryptoKey::reset() 95 void WebCryptoKey::reset()
96 { 96 {
97 m_private.reset(); 97 m_private.reset();
98 } 98 }
99 99
100 } // namespace WebKit 100 } // namespace WebKit
OLDNEW
« no previous file with comments | « no previous file | Source/modules/crypto/Key.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698