summaryrefslogtreecommitdiffstats
path: root/remoting/capturer
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:52:52 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:52:52 +0000
commit111d31efd808ef4a9a78c84fbc48e5ba74c67ed0 (patch)
tree414f0da9922bad47145921da6a231fc707f18a58 /remoting/capturer
parentc572f5c8a5651e004b1b1378438c92ac9e57e3b5 (diff)
downloadchromium_src-111d31efd808ef4a9a78c84fbc48e5ba74c67ed0.zip
chromium_src-111d31efd808ef4a9a78c84fbc48e5ba74c67ed0.tar.gz
chromium_src-111d31efd808ef4a9a78c84fbc48e5ba74c67ed0.tar.bz2
Remove unused VideoFrameCapturer::size_most_recent() method.
BUG=104544 Review URL: https://chromiumcodereview.appspot.com/11821004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/capturer')
-rw-r--r--remoting/capturer/video_capturer_mock_objects.h1
-rw-r--r--remoting/capturer/video_frame_capturer.h3
-rw-r--r--remoting/capturer/video_frame_capturer_fake.cc4
-rw-r--r--remoting/capturer/video_frame_capturer_fake.h1
-rw-r--r--remoting/capturer/video_frame_capturer_linux.cc5
-rw-r--r--remoting/capturer/video_frame_capturer_mac.mm5
-rw-r--r--remoting/capturer/video_frame_capturer_win.cc5
7 files changed, 0 insertions, 24 deletions
diff --git a/remoting/capturer/video_capturer_mock_objects.h b/remoting/capturer/video_capturer_mock_objects.h
index 5afd123..f460c1f 100644
--- a/remoting/capturer/video_capturer_mock_objects.h
+++ b/remoting/capturer/video_capturer_mock_objects.h
@@ -21,7 +21,6 @@ class MockVideoFrameCapturer : public VideoFrameCapturer {
MOCK_METHOD0(Stop, void());
MOCK_METHOD1(InvalidateRegion, void(const SkRegion& invalid_region));
MOCK_METHOD0(CaptureFrame, void());
- MOCK_CONST_METHOD0(size_most_recent, const SkISize&());
private:
DISALLOW_COPY_AND_ASSIGN(MockVideoFrameCapturer);
diff --git a/remoting/capturer/video_frame_capturer.h b/remoting/capturer/video_frame_capturer.h
index d126126..f16616b 100644
--- a/remoting/capturer/video_frame_capturer.h
+++ b/remoting/capturer/video_frame_capturer.h
@@ -107,9 +107,6 @@ class VideoFrameCapturer {
// data of the previous capture. There can be at most one concurrent read
// going on when this method is called.
virtual void CaptureFrame() = 0;
-
- // Get the size of the most recently captured screen.
- virtual const SkISize& size_most_recent() const = 0;
};
} // namespace remoting
diff --git a/remoting/capturer/video_frame_capturer_fake.cc b/remoting/capturer/video_frame_capturer_fake.cc
index 7c25432..8cdff43 100644
--- a/remoting/capturer/video_frame_capturer_fake.cc
+++ b/remoting/capturer/video_frame_capturer_fake.cc
@@ -70,10 +70,6 @@ void VideoFrameCapturerFake::CaptureFrame() {
delegate_->OnCaptureCompleted(capture_data);
}
-const SkISize& VideoFrameCapturerFake::size_most_recent() const {
- return helper_.size_most_recent();
-}
-
void VideoFrameCapturerFake::GenerateImage() {
memset(buffers_[current_buffer_].get(), 0xff,
size_.width() * size_.height() * CaptureData::kBytesPerPixel);
diff --git a/remoting/capturer/video_frame_capturer_fake.h b/remoting/capturer/video_frame_capturer_fake.h
index 0547796..b116967 100644
--- a/remoting/capturer/video_frame_capturer_fake.h
+++ b/remoting/capturer/video_frame_capturer_fake.h
@@ -29,7 +29,6 @@ class VideoFrameCapturerFake : public VideoFrameCapturer {
virtual void Stop() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
virtual void CaptureFrame() OVERRIDE;
- virtual const SkISize& size_most_recent() const OVERRIDE;
private:
// Generates an image in the front buffer.
diff --git a/remoting/capturer/video_frame_capturer_linux.cc b/remoting/capturer/video_frame_capturer_linux.cc
index c3f33af..edfa1a4 100644
--- a/remoting/capturer/video_frame_capturer_linux.cc
+++ b/remoting/capturer/video_frame_capturer_linux.cc
@@ -62,7 +62,6 @@ class VideoFrameCapturerLinux : public VideoFrameCapturer {
virtual void Stop() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
virtual void CaptureFrame() OVERRIDE;
- virtual const SkISize& size_most_recent() const OVERRIDE;
private:
void InitXDamage();
@@ -589,10 +588,6 @@ void VideoFrameCapturerLinux::SlowBlit(uint8* image, const SkIRect& rect,
}
}
-const SkISize& VideoFrameCapturerLinux::size_most_recent() const {
- return helper_.size_most_recent();
-}
-
} // namespace
// static
diff --git a/remoting/capturer/video_frame_capturer_mac.mm b/remoting/capturer/video_frame_capturer_mac.mm
index 8230c9b..8b10cac 100644
--- a/remoting/capturer/video_frame_capturer_mac.mm
+++ b/remoting/capturer/video_frame_capturer_mac.mm
@@ -112,7 +112,6 @@ class VideoFrameCapturerMac : public VideoFrameCapturer {
virtual void Stop() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
virtual void CaptureFrame() OVERRIDE;
- virtual const SkISize& size_most_recent() const OVERRIDE;
private:
void CaptureCursor();
@@ -653,10 +652,6 @@ void VideoFrameCapturerMac::CgBlitPostLion(const VideoFrame& buffer,
}
}
-const SkISize& VideoFrameCapturerMac::size_most_recent() const {
- return helper_.size_most_recent();
-}
-
void VideoFrameCapturerMac::ScreenConfigurationChanged() {
// Release existing buffers, which will be of the wrong size.
ReleaseBuffers();
diff --git a/remoting/capturer/video_frame_capturer_win.cc b/remoting/capturer/video_frame_capturer_win.cc
index d39ee64..59e978c 100644
--- a/remoting/capturer/video_frame_capturer_win.cc
+++ b/remoting/capturer/video_frame_capturer_win.cc
@@ -86,7 +86,6 @@ class VideoFrameCapturerWin : public VideoFrameCapturer {
virtual void Stop() OVERRIDE;
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
virtual void CaptureFrame() OVERRIDE;
- virtual const SkISize& size_most_recent() const OVERRIDE;
private:
// Make sure that the device contexts match the screen configuration.
@@ -275,10 +274,6 @@ void VideoFrameCapturerWin::CaptureFrame() {
CaptureCursor();
}
-const SkISize& VideoFrameCapturerWin::size_most_recent() const {
- return helper_.size_most_recent();
-}
-
void VideoFrameCapturerWin::Start(Delegate* delegate) {
DCHECK(delegate_ == NULL);