diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 19:35:11 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 19:35:11 +0000 |
| commit | 31ab49fb68031f93248c1b3d1b51e343e67cf76e (patch) | |
| tree | 20879ccec4399b8fd8b069198932581f2b579c6f /content | |
| parent | 4f5ce84f636b74420e62c63f657a5a0ad8c92bb0 (diff) | |
| download | chromium_src-31ab49fb68031f93248c1b3d1b51e343e67cf76e.zip chromium_src-31ab49fb68031f93248c1b3d1b51e343e67cf76e.tar.gz chromium_src-31ab49fb68031f93248c1b3d1b51e343e67cf76e.tar.bz2 | |
Move media library AutoTaskRunner to base and rename ScopedTaskRunner.
This is needed to avoid faux dependencies on media/ creeping in to remoting/ code, and creating linker issues.
BUG=
TEST=Everything works as before. Shared component builds certainly don't break.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86971 (Reverted - broke shared builds)
Review URL: http://codereview.chromium.org/7062013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/video_capture_impl.cc | 2 | ||||
| -rw-r--r-- | content/renderer/media/video_capture_impl.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index faf4565..da02e2f 100644 --- a/content/renderer/media/video_capture_impl.cc +++ b/content/renderer/media/video_capture_impl.cc @@ -381,6 +381,6 @@ void VideoCaptureImpl::AddDelegateOnIOThread() { } void VideoCaptureImpl::RemoveDelegateOnIOThread(Task* task) { + base::ScopedTaskRunner task_runner(task); message_filter_->RemoveDelegate(this); - media::AutoTaskRunner auto_runner(task); } diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index 4613e4b..68549ef 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -13,7 +13,6 @@ #include <map> #include "content/renderer/video_capture_message_filter.h" -#include "media/base/callback.h" #include "media/video/capture/video_capture.h" #include "ui/gfx/surface/transport_dib.h" |