diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:42 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:42 +0000 |
| commit | d843cc13b385ed30100bfa0cd3b08897ca8cd8b9 (patch) | |
| tree | 7805cc828612b296ebef94541b12bf14064e1785 /media | |
| parent | 5f31c18bb4f01034c9b6076746cd98f56ab9c196 (diff) | |
| download | chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.zip chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.tar.gz chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.tar.bz2 | |
fix a racing condition when renderer process requests StopCapture before host gets controller
fix a typo (thanks ihf@)
BUG=104581
TEST=trybots
Review URL: http://codereview.chromium.org/8549010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/video_capture.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/media/video/capture/video_capture.h b/media/video/capture/video_capture.h index 62d5d37..0af1abf 100644 --- a/media/video/capture/video_capture.h +++ b/media/video/capture/video_capture.h @@ -18,17 +18,6 @@ namespace media { class MEDIA_EXPORT VideoCapture { public: - // Current status of the video capture device in the browser process. Browser - // process sends information about the current capture state and error to the - // renderer process using this type. - enum State { - kStarted, - kPaused, - kStopped, - kStopping, - kError, - }; - // TODO(wjia): consider merging with media::VideoFrame if possible. class VideoFrameBuffer : public base::RefCountedThreadSafe<VideoFrameBuffer> { public: |