diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 05:06:04 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 05:06:04 +0000 |
| commit | d0870532614ec8fa68782a55a013d3da41a9175b (patch) | |
| tree | a293500da5b10a4c2c54845f84c6e6265057d807 /content | |
| parent | c9c0d079c24a02f8f9b667f3cbf06d234a586625 (diff) | |
| download | chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.zip chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.tar.gz chromium_src-d0870532614ec8fa68782a55a013d3da41a9175b.tar.bz2 | |
1;2305;0cRevert 86971 - 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.
Review URL: http://codereview.chromium.org/7062013
TBR=wez@chromium.org
Review URL: http://codereview.chromium.org/7062042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86972 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, 2 insertions, 1 deletions
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index da02e2f..faf4565 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 68549ef..4613e4b 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -13,6 +13,7 @@ #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" |