content/renderer/media/android/webmediaplayer_android.cc - Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/

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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/media_stream_video_capture_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc

index 284123addec796a4fd0b10c24e0ec5dc6d0fc97d..c36c1fc727055ddebc4aa2e011f008226df9741f 100644

--- a/content/renderer/media/android/webmediaplayer_android.cc

+++ b/content/renderer/media/android/webmediaplayer_android.cc

@@ -8,6 +8,7 @@

#include "base/android/build_info.h"

#include "base/bind.h"

+#include "base/bind_to_current_loop.h"

#include "base/callback_helpers.h"

#include "base/command_line.h"

#include "base/files/file_path.h"

@@ -34,7 +35,6 @@

#include "gpu/command_buffer/common/mailbox_holder.h"

#include "media/base/android/media_common_android.h"

#include "media/base/android/media_player_android.h"

-#include "media/base/bind_to_current_loop.h"

#include "media/base/cdm_context.h"

#include "media/base/key_systems.h"

#include "media/base/media_keys.h"

@@ -1204,7 +1204,7 @@ void WebMediaPlayerAndroid::DrawRemotePlaybackText(

scoped_refptr<VideoFrame> new_frame = VideoFrame::WrapNativeTexture(

make_scoped_ptr(new gpu::MailboxHolder(texture_mailbox, texture_target,

texture_mailbox_sync_point)),

- media::BindToCurrentLoop(base::Bind(&OnReleaseTexture,

+ base::BindToCurrentLoop(base::Bind(&OnReleaseTexture,

stream_texture_factory_,

remote_playback_texture_id)),

canvas_size /* coded_size */, gfx::Rect(canvas_size) /* visible_rect */,

@@ -1242,7 +1242,7 @@ void WebMediaPlayerAndroid::ReallocateVideoFrame() {

scoped_refptr<VideoFrame> new_frame = VideoFrame::WrapNativeTexture(

make_scoped_ptr(new gpu::MailboxHolder(texture_mailbox_, texture_target,

texture_mailbox_sync_point)),

- media::BindToCurrentLoop(base::Bind(

+ base::BindToCurrentLoop(base::Bind(

&OnReleaseTexture, stream_texture_factory_, texture_id_ref)),

natural_size_, gfx::Rect(natural_size_), natural_size_,

base::TimeDelta(), false);

@@ -1660,7 +1660,7 @@ void WebMediaPlayerAndroid::setContentDecryptionModule(

cdm_context_ = media::ToWebContentDecryptionModuleImpl(cdm)->GetCdmContext();

if (is_player_initialized_) {

- SetCdmInternal(media::BindToCurrentLoop(

+ SetCdmInternal(base::BindToCurrentLoop(

base::Bind(&WebMediaPlayerAndroid::ContentDecryptionModuleAttached,

weak_factory_.GetWeakPtr(), result)));

} else {