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

Side by Side Diff: webkit/plugins/ppapi/content_decryptor_delegate.cc

Issue 14307012: webkit: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/npapi/webplugin_impl.cc ('k') | webkit/plugins/ppapi/message_channel.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 (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 "webkit/plugins/ppapi/content_decryptor_delegate.h" 5 #include "webkit/plugins/ppapi/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_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 const PPP_ContentDecryptor_Private* plugin_decryption_interface) 274 const PPP_ContentDecryptor_Private* plugin_decryption_interface)
275 : pp_instance_(pp_instance), 275 : pp_instance_(pp_instance),
276 plugin_decryption_interface_(plugin_decryption_interface), 276 plugin_decryption_interface_(plugin_decryption_interface),
277 next_decryption_request_id_(1), 277 next_decryption_request_id_(1),
278 pending_audio_decrypt_request_id_(0), 278 pending_audio_decrypt_request_id_(0),
279 pending_video_decrypt_request_id_(0), 279 pending_video_decrypt_request_id_(0),
280 pending_audio_decoder_init_request_id_(0), 280 pending_audio_decoder_init_request_id_(0),
281 pending_video_decoder_init_request_id_(0), 281 pending_video_decoder_init_request_id_(0),
282 pending_audio_decode_request_id_(0), 282 pending_audio_decode_request_id_(0),
283 pending_video_decode_request_id_(0), 283 pending_video_decode_request_id_(0),
284 ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), 284 weak_ptr_factory_(this),
285 weak_this_(weak_ptr_factory_.GetWeakPtr()) { 285 weak_this_(weak_ptr_factory_.GetWeakPtr()) {
286 } 286 }
287 287
288 void ContentDecryptorDelegate::SetKeyEventCallbacks( 288 void ContentDecryptorDelegate::SetKeyEventCallbacks(
289 const media::KeyAddedCB& key_added_cb, 289 const media::KeyAddedCB& key_added_cb,
290 const media::KeyErrorCB& key_error_cb, 290 const media::KeyErrorCB& key_error_cb,
291 const media::KeyMessageCB& key_message_cb, 291 const media::KeyMessageCB& key_message_cb,
292 const media::NeedKeyCB& need_key_cb) { 292 const media::NeedKeyCB& need_key_cb) {
293 key_added_cb_ = key_added_cb; 293 key_added_cb_ = key_added_cb;
294 key_error_cb_ = key_error_cb; 294 key_error_cb_ = key_error_cb;
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 1025
1026 if (free_buffers_.empty()) 1026 if (free_buffers_.empty())
1027 return; 1027 return;
1028 1028
1029 tracking_info->buffer_id = free_buffers_.front(); 1029 tracking_info->buffer_id = free_buffers_.front();
1030 free_buffers_.pop(); 1030 free_buffers_.pop();
1031 } 1031 }
1032 1032
1033 } // namespace ppapi 1033 } // namespace ppapi
1034 } // namespace webkit 1034 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/webplugin_impl.cc ('k') | webkit/plugins/ppapi/message_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698