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

Unified Diff: remoting/host/video_frame_capturer_win.cc

Issue 10799013: Removing unused and private methods remoting::Capturer interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 5 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
« no previous file with comments | « remoting/host/video_frame_capturer_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/video_frame_capturer_win.cc
diff --git a/remoting/host/video_frame_capturer_win.cc b/remoting/host/video_frame_capturer_win.cc
index aee667e4915c3abe1e8a182dd6b589dd5765d8b0..86c142dd14e9a26906de93c8f5c7945676cbb52e 100644
--- a/remoting/host/video_frame_capturer_win.cc
+++ b/remoting/host/video_frame_capturer_win.cc
@@ -49,12 +49,8 @@ class VideoFrameCapturerWin : public VideoFrameCapturer {
// Overridden from VideoFrameCapturer:
virtual void Start(const CursorShapeChangedCallback& callback) OVERRIDE;
virtual void Stop() OVERRIDE;
- virtual void ScreenConfigurationChanged() OVERRIDE;
virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
- virtual void ClearInvalidRegion() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
- virtual void InvalidateScreen(const SkISize& size) OVERRIDE;
- virtual void InvalidateFullScreen() OVERRIDE;
virtual void CaptureInvalidRegion(
const CaptureCompletedCallback& callback) OVERRIDE;
virtual const SkISize& size_most_recent() const OVERRIDE;
@@ -156,7 +152,6 @@ VideoFrameCapturerWin::VideoFrameCapturerWin()
current_buffer_(0),
pixel_format_(media::VideoFrame::RGB32),
composition_func_(NULL) {
- ScreenConfigurationChanged();
}
VideoFrameCapturerWin::~VideoFrameCapturerWin() {
@@ -166,22 +161,10 @@ media::VideoFrame::Format VideoFrameCapturerWin::pixel_format() const {
return pixel_format_;
}
-void VideoFrameCapturerWin::ClearInvalidRegion() {
- helper_.ClearInvalidRegion();
-}
-
void VideoFrameCapturerWin::InvalidateRegion(const SkRegion& invalid_region) {
helper_.InvalidateRegion(invalid_region);
}
-void VideoFrameCapturerWin::InvalidateScreen(const SkISize& size) {
- helper_.InvalidateScreen(size);
-}
-
-void VideoFrameCapturerWin::InvalidateFullScreen() {
- helper_.InvalidateFullScreen();
-}
-
void VideoFrameCapturerWin::CaptureInvalidRegion(
const CaptureCompletedCallback& callback) {
// Force the system to power-up display hardware, if it has been suspended.
@@ -231,10 +214,6 @@ void VideoFrameCapturerWin::Stop() {
}
}
-void VideoFrameCapturerWin::ScreenConfigurationChanged() {
- // We poll for screen configuration changes, so ignore notifications.
-}
-
void VideoFrameCapturerWin::PrepareCaptureResources() {
// Switch to the desktop receiving user input if different from the current
// one.
@@ -279,7 +258,11 @@ void VideoFrameCapturerWin::PrepareCaptureResources() {
// may still be reading from them.
if (resource_generation_ != buffers_[current_buffer_].resource_generation) {
AllocateBuffer(current_buffer_);
- InvalidateFullScreen();
+
+ SkRegion region;
+ region.op(SkIRect::MakeSize(helper_.size_most_recent()),
+ SkRegion::kUnion_Op);
+ InvalidateRegion(region);
}
}
@@ -331,7 +314,7 @@ void VideoFrameCapturerWin::CalculateInvalidRegion() {
if ((current.size != prev.size) ||
(current.bytes_per_pixel != prev.bytes_per_pixel) ||
(current.bytes_per_row != prev.bytes_per_row)) {
- InvalidateScreen(current.size);
+ helper_.InvalidateScreen(current.size);
return;
}
« no previous file with comments | « remoting/host/video_frame_capturer_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698