OLD | NEW |
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 "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
10 #include "base/metrics/sparse_histogram.h" | 10 #include "base/metrics/sparse_histogram.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "media/base/video_decoder_config.h" | 23 #include "media/base/video_decoder_config.h" |
24 #include "media/base/video_frame.h" | 24 #include "media/base/video_frame.h" |
25 #include "media/base/video_util.h" | 25 #include "media/base/video_util.h" |
26 #include "ppapi/shared_impl/array_var.h" | 26 #include "ppapi/shared_impl/array_var.h" |
27 #include "ppapi/shared_impl/scoped_pp_resource.h" | 27 #include "ppapi/shared_impl/scoped_pp_resource.h" |
28 #include "ppapi/shared_impl/time_conversion.h" | 28 #include "ppapi/shared_impl/time_conversion.h" |
29 #include "ppapi/shared_impl/var.h" | 29 #include "ppapi/shared_impl/var.h" |
30 #include "ppapi/shared_impl/var_tracker.h" | 30 #include "ppapi/shared_impl/var_tracker.h" |
31 #include "ppapi/thunk/enter.h" | 31 #include "ppapi/thunk/enter.h" |
32 #include "ppapi/thunk/ppb_buffer_api.h" | 32 #include "ppapi/thunk/ppb_buffer_api.h" |
33 #include "ui/gfx/rect.h" | 33 #include "ui/gfx/geometry/rect.h" |
34 | 34 |
35 using media::CdmPromise; | 35 using media::CdmPromise; |
36 using media::Decryptor; | 36 using media::Decryptor; |
37 using media::MediaKeys; | 37 using media::MediaKeys; |
38 using media::NewSessionCdmPromise; | 38 using media::NewSessionCdmPromise; |
39 using media::SimpleCdmPromise; | 39 using media::SimpleCdmPromise; |
40 using ppapi::ArrayBufferVar; | 40 using ppapi::ArrayBufferVar; |
41 using ppapi::ArrayVar; | 41 using ppapi::ArrayVar; |
42 using ppapi::PpapiGlobals; | 42 using ppapi::PpapiGlobals; |
43 using ppapi::ScopedPPResource; | 43 using ppapi::ScopedPPResource; |
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 | 1274 |
1275 scoped_ptr<CdmPromise> ContentDecryptorDelegate::TakePromise( | 1275 scoped_ptr<CdmPromise> ContentDecryptorDelegate::TakePromise( |
1276 uint32_t promise_id) { | 1276 uint32_t promise_id) { |
1277 PromiseMap::iterator it = promises_.find(promise_id); | 1277 PromiseMap::iterator it = promises_.find(promise_id); |
1278 if (it == promises_.end()) | 1278 if (it == promises_.end()) |
1279 return scoped_ptr<CdmPromise>(); | 1279 return scoped_ptr<CdmPromise>(); |
1280 return promises_.take_and_erase(it); | 1280 return promises_.take_and_erase(it); |
1281 } | 1281 } |
1282 | 1282 |
1283 } // namespace content | 1283 } // namespace content |
OLD | NEW |