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

Unified Diff: media/video/capture/screen/screen_capturer_win.cc

Issue 14305004: Simplify ScreenCapturer interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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: media/video/capture/screen/screen_capturer_win.cc
diff --git a/media/video/capture/screen/screen_capturer_win.cc b/media/video/capture/screen/screen_capturer_win.cc
index 0817ee5e9b162f073ad410e828463de97a17fbaf..2e1d4a4694b0821ede8d5e0166abde39a06114da 100644
--- a/media/video/capture/screen/screen_capturer_win.cc
+++ b/media/video/capture/screen/screen_capturer_win.cc
@@ -80,8 +80,6 @@ class ScreenCapturerWin : public ScreenCapturer {
// Overridden from ScreenCapturer:
virtual void Start(Delegate* delegate) OVERRIDE;
- virtual void Stop() OVERRIDE;
- virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
virtual void CaptureFrame() OVERRIDE;
private:
@@ -211,10 +209,12 @@ ScreenCapturerWin::ScreenCapturerWin()
}
ScreenCapturerWin::~ScreenCapturerWin() {
-}
+ // Restore Aero.
+ if (composition_func_ != NULL) {
+ (*composition_func_)(DWM_EC_ENABLECOMPOSITION);
+ }
-void ScreenCapturerWin::InvalidateRegion(const SkRegion& invalid_region) {
- helper_.InvalidateRegion(invalid_region);
+ delegate_ = NULL;
}
void ScreenCapturerWin::CaptureFrame() {
@@ -254,7 +254,7 @@ void ScreenCapturerWin::CaptureFrame() {
SkRegion region;
differ_->CalcDirtyRegion(last_buffer->pixels(), current_buffer->pixels(),
&region);
- InvalidateRegion(region);
+ helper_.InvalidateRegion(region);
} else {
// No previous frame is available. Invalidate the whole screen.
helper_.InvalidateScreen(current_buffer->dimensions());
@@ -295,15 +295,6 @@ void ScreenCapturerWin::Start(Delegate* delegate) {
}
}
-void ScreenCapturerWin::Stop() {
- // Restore Aero.
- if (composition_func_ != NULL) {
- (*composition_func_)(DWM_EC_ENABLECOMPOSITION);
- }
-
- delegate_ = NULL;
-}
-
void ScreenCapturerWin::PrepareCaptureResources() {
// Switch to the desktop receiving user input if different from the current
// one.
« no previous file with comments | « media/video/capture/screen/screen_capturer_unittest.cc ('k') | media/video/capture/screen/screen_capturer_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698