| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 127 |
| 128 } // namespace | 128 } // namespace |
| 129 | 129 |
| 130 CryptoKey::~CryptoKey() | 130 CryptoKey::~CryptoKey() |
| 131 { | 131 { |
| 132 } | 132 } |
| 133 | 133 |
| 134 CryptoKey::CryptoKey(const WebCryptoKey& key) | 134 CryptoKey::CryptoKey(const WebCryptoKey& key) |
| 135 : m_key(key) | 135 : m_key(key) |
| 136 { | 136 { |
| 137 ScriptWrappable::init(this); | |
| 138 } | 137 } |
| 139 | 138 |
| 140 String CryptoKey::type() const | 139 String CryptoKey::type() const |
| 141 { | 140 { |
| 142 return keyTypeToString(m_key.type()); | 141 return keyTypeToString(m_key.type()); |
| 143 } | 142 } |
| 144 | 143 |
| 145 bool CryptoKey::extractable() const | 144 bool CryptoKey::extractable() const |
| 146 { | 145 { |
| 147 return m_key.extractable(); | 146 return m_key.extractable(); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 if (!usage) { | 208 if (!usage) { |
| 210 result->completeWithError(WebCryptoErrorTypeSyntax, "Invalid keyUsag
es argument"); | 209 result->completeWithError(WebCryptoErrorTypeSyntax, "Invalid keyUsag
es argument"); |
| 211 return false; | 210 return false; |
| 212 } | 211 } |
| 213 mask |= usage; | 212 mask |= usage; |
| 214 } | 213 } |
| 215 return true; | 214 return true; |
| 216 } | 215 } |
| 217 | 216 |
| 218 } // namespace blink | 217 } // namespace blink |
| OLD | NEW |