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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 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
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 virtual void setUint(const char* propertyName, unsigned value) 113 virtual void setUint(const char* propertyName, unsigned value)
114 { 114 {
115 m_builder.addNumber(propertyName, value); 115 m_builder.addNumber(propertyName, value);
116 } 116 }
117 117
118 virtual void setAlgorithm(const char* propertyName, const WebCryptoAlgorithm & algorithm) 118 virtual void setAlgorithm(const char* propertyName, const WebCryptoAlgorithm & algorithm)
119 { 119 {
120 ASSERT(algorithm.paramsType() == WebCryptoAlgorithmParamsTypeNone); 120 ASSERT(algorithm.paramsType() == WebCryptoAlgorithmParamsTypeNone);
121 121
122 V8ObjectBuilder algorithmValue(m_builder.scriptState()); 122 V8ObjectBuilder algorithmValue(m_builder.getScriptState());
123 algorithmValue.addString("name", WebCryptoAlgorithm::lookupAlgorithmInfo (algorithm.id())->name); 123 algorithmValue.addString("name", WebCryptoAlgorithm::lookupAlgorithmInfo (algorithm.id())->name);
124 m_builder.add(propertyName, algorithmValue); 124 m_builder.add(propertyName, algorithmValue);
125 } 125 }
126 126
127 virtual void setUint8Array(const char* propertyName, const WebVector<unsigne d char>& vector) 127 virtual void setUint8Array(const char* propertyName, const WebVector<unsigne d char>& vector)
128 { 128 {
129 m_builder.add(propertyName, DOMUint8Array::create(vector.data(), vector. size())); 129 m_builder.add(propertyName, DOMUint8Array::create(vector.data(), vector. size()));
130 } 130 }
131 131
132 private: 132 private:
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 if (!usage) { 224 if (!usage) {
225 result->completeWithError(WebCryptoErrorTypeType, "Invalid keyUsages argument"); 225 result->completeWithError(WebCryptoErrorTypeType, "Invalid keyUsages argument");
226 return false; 226 return false;
227 } 227 }
228 mask |= usage; 228 mask |= usage;
229 } 229 }
230 return true; 230 return true;
231 } 231 }
232 232
233 } // namespace blink 233 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698