Index: content/browser/media/capture/desktop_capture_device_aura.cc |
diff --git a/content/browser/media/capture/desktop_capture_device_aura.cc b/content/browser/media/capture/desktop_capture_device_aura.cc |
index 1880e3a7b035642e9512d08cc0979fe753f9d598..e858ae7ec3309c06bd08938152ea2e00b6b5fce2 100644 |
--- a/content/browser/media/capture/desktop_capture_device_aura.cc |
+++ b/content/browser/media/capture/desktop_capture_device_aura.cc |
@@ -14,7 +14,6 @@ |
#include "content/browser/media/capture/desktop_capture_device_uma_types.h" |
#include "content/common/gpu/client/gl_helper.h" |
#include "content/public/browser/browser_thread.h" |
-#include "media/base/bind_to_current_loop.h" |
#include "media/base/video_util.h" |
#include "media/video/capture/video_capture_types.h" |
#include "skia/ext/image_operations.h" |
@@ -296,14 +295,8 @@ void CopyOutputFinishedForVideo( |
} |
void RunSingleReleaseCallback(scoped_ptr<cc::SingleReleaseCallback> cb, |
- const std::vector<uint32>& sync_points) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper(); |
- DCHECK(gl_helper); |
- for (unsigned i = 0; i < sync_points.size(); i++) |
- gl_helper->WaitSyncPoint(sync_points[i]); |
- uint32 new_sync_point = gl_helper->InsertSyncPoint(); |
- cb->Run(new_sync_point, false); |
+ uint32 sync_point) { |
+ cb->Run(sync_point, false); |
} |
void DesktopVideoCaptureMachine::DidCopyOutput( |
@@ -357,8 +350,7 @@ bool DesktopVideoCaptureMachine::ProcessCopyOutputResponse( |
make_scoped_ptr(new gpu::MailboxHolder(texture_mailbox.mailbox(), |
texture_mailbox.target(), |
texture_mailbox.sync_point())), |
- media::BindToCurrentLoop(base::Bind(&RunSingleReleaseCallback, |
- base::Passed(&release_callback))), |
+ base::Bind(&RunSingleReleaseCallback, base::Passed(&release_callback)), |
result->size(), |
gfx::Rect(result->size()), |
result->size(), |