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

Unified Diff: content/browser/renderer_host/media/video_capture_texture_wrapper.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
Index: content/browser/renderer_host/media/video_capture_texture_wrapper.cc
diff --git a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
index 339596ee1aea90bfae4ee41ddf9ab366470d5538..bd8f8b4529e20183420846728837d74b7878495c 100644
--- a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
+++ b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/media/video_capture_texture_wrapper.h"
#include "base/bind.h"
+#include "base/bind_to_current_loop.h"
#include "content/browser/compositor/image_transport_factory.h"
#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
@@ -17,7 +18,6 @@
#include "content/common/gpu/gpu_process_launch_causes.h"
#include "content/public/browser/browser_thread.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
-#include "media/base/bind_to_current_loop.h"
#include "media/base/video_capture_types.h"
#include "media/base/video_frame.h"
#include "third_party/khronos/GLES2/gl2ext.h"
@@ -321,7 +321,7 @@ void VideoCaptureTextureWrapper::TextureWrapperDelegate::OnIncomingCapturedData(
scoped_refptr<media::VideoFrame> video_frame =
media::VideoFrame::WrapNativeTexture(
mailbox_holder.Pass(),
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(&VideoCaptureTextureWrapper::TextureWrapperDelegate::
ReleaseCallback,
this, image_id, texture_id, gpu_memory_buffer)),
@@ -390,7 +390,7 @@ void VideoCaptureTextureWrapper::TextureWrapperDelegate::Init(
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&CreateContextOnUIThread,
- media::BindToCurrentLoop(
+ base::BindToCurrentLoop(
base::Bind(&VideoCaptureTextureWrapper::
TextureWrapperDelegate::CreateGlHelper,
this))));
@@ -407,7 +407,7 @@ void VideoCaptureTextureWrapper::TextureWrapperDelegate::CreateGlHelper(
// This may not happen in IO Thread. The destructor resets the context lost
// callback, so base::Unretained is safe; otherwise it'd be a circular ref
// counted dependency.
- capture_thread_context->SetLostContextCallback(media::BindToCurrentLoop(
+ capture_thread_context->SetLostContextCallback(base::BindToCurrentLoop(
base::Bind(
&VideoCaptureTextureWrapper::TextureWrapperDelegate::
LostContextCallback,
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/gpu/media/v4l2_image_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698