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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 1544273002: Switch to standard integer types in content/. (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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/pepper/content_decryptor_delegate.h" 5 #include "content/renderer/pepper/content_decryptor_delegate.h"
6 6
7 #include <string.h>
8
7 #include <vector> 9 #include <vector>
8 10
9 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/metrics/sparse_histogram.h" 13 #include "base/metrics/sparse_histogram.h"
12 #include "base/numerics/safe_conversions.h" 14 #include "base/numerics/safe_conversions.h"
13 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
14 #include "content/renderer/pepper/ppb_buffer_impl.h" 16 #include "content/renderer/pepper/ppb_buffer_impl.h"
15 #include "media/base/audio_buffer.h" 17 #include "media/base/audio_buffer.h"
16 #include "media/base/audio_decoder_config.h" 18 #include "media/base/audio_decoder_config.h"
(...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 empty_frames); 1284 empty_frames);
1283 } 1285 }
1284 1286
1285 if (!video_decode_cb_.is_null()) 1287 if (!video_decode_cb_.is_null())
1286 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); 1288 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
1287 1289
1288 cdm_promise_adapter_.Clear(); 1290 cdm_promise_adapter_.Clear();
1289 } 1291 }
1290 1292
1291 } // namespace content 1293 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/speech_recognition_audio_sink_unittest.cc ('k') | content/renderer/pepper/event_conversion.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698