content/renderer/pepper/content_decryptor_delegate.cc - Issue 132163006: Rename media/base/bind_to_loop.h to media/base/bind_to_current_loop.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 132163006: Rename media/base/bind_to_loop.h to media/base/bind_to_current_loop.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 | « content/renderer/media/webmediaplayer_impl.cc ('k') | media/audio/mac/audio_device_listener_mac_unittest.cc » ('j') | media/base/bind_to_current_loop_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/safe_numerics.h"	10 #include "base/safe_numerics.h"

11 #include "content/renderer/pepper/ppb_buffer_impl.h"	11 #include "content/renderer/pepper/ppb_buffer_impl.h"

12 #include "media/base/audio_buffer.h"	12 #include "media/base/audio_buffer.h"

13 #include "media/base/audio_decoder_config.h"	13 #include "media/base/audio_decoder_config.h"

14 #include "media/base/bind_to_loop.h"	14 #include "media/base/bind_to_current_loop.h"

15 #include "media/base/channel_layout.h"	15 #include "media/base/channel_layout.h"

16 #include "media/base/data_buffer.h"	16 #include "media/base/data_buffer.h"

17 #include "media/base/decoder_buffer.h"	17 #include "media/base/decoder_buffer.h"

18 #include "media/base/decrypt_config.h"	18 #include "media/base/decrypt_config.h"

19 #include "media/base/video_decoder_config.h"	19 #include "media/base/video_decoder_config.h"

20 #include "media/base/video_frame.h"	20 #include "media/base/video_frame.h"

21 #include "media/base/video_util.h"	21 #include "media/base/video_util.h"

22 #include "ppapi/shared_impl/scoped_pp_resource.h"	22 #include "ppapi/shared_impl/scoped_pp_resource.h"

23 #include "ppapi/shared_impl/var.h"	23 #include "ppapi/shared_impl/var.h"

24 #include "ppapi/shared_impl/var_tracker.h"	24 #include "ppapi/shared_impl/var_tracker.h"

(...skipping 1021 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1046 const media::Decryptor::AudioBuffers empty_frames;	1046 const media::Decryptor::AudioBuffers empty_frames;

1047 audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,	1047 audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,

1048 empty_frames);	1048 empty_frames);

1049 }	1049 }

1050	1050

1051 if (!video_decode_cb_.is_null())	1051 if (!video_decode_cb_.is_null())

1052 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);	1052 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);

1053 }	1053 }

1054	1054

1055 } // namespace content	1055 } // namespace content

OLD	NEW