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

Side by Side Diff: media/cdm/json_web_key.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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 | « media/cdm/json_web_key.h ('k') | media/cdm/json_web_key_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "media/cdm/json_web_key.h" 5 #include "media/cdm/json_web_key.h"
6 6
7 #include <stddef.h>
8
7 #include "base/base64url.h" 9 #include "base/base64url.h"
8 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
9 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
10 #include "base/json/string_escape.h" 12 #include "base/json/string_escape.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
13 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_piece.h" 17 #include "base/strings/string_piece.h"
15 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
16 #include "base/values.h" 19 #include "base/values.h"
17 20
18 namespace media { 21 namespace media {
19 22
20 const char kKeysTag[] = "keys"; 23 const char kKeysTag[] = "keys";
21 const char kKeyTypeTag[] = "kty"; 24 const char kKeyTypeTag[] = "kty";
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key; 408 DVLOG(1) << "Invalid '" << kKeyIdsTag << "' value: " << encoded_key;
406 return false; 409 return false;
407 } 410 }
408 411
409 std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end()); 412 std::vector<uint8_t> result(decoded_string.begin(), decoded_string.end());
410 first_key->swap(result); 413 first_key->swap(result);
411 return true; 414 return true;
412 } 415 }
413 416
414 } // namespace media 417 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/json_web_key.h ('k') | media/cdm/json_web_key_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698