| Index: remoting/host/capturer_linux.cc
|
| diff --git a/remoting/host/capturer_linux.cc b/remoting/host/capturer_linux.cc
|
| index 825e724c936d9d6d9fed1ad993396a860a08881f..062f259796609808a45ddf49cbafede1a7122573 100644
|
| --- a/remoting/host/capturer_linux.cc
|
| +++ b/remoting/host/capturer_linux.cc
|
| @@ -41,7 +41,7 @@ class VideoFrameBuffer {
|
| XGetWindowAttributes(display, root_window, &root_attr);
|
| if (root_attr.width != size_.width() ||
|
| root_attr.height != size_.height()) {
|
| - size_.SetSize(root_attr.width, root_attr.height);
|
| + size_.set(root_attr.width, root_attr.height);
|
| bytes_per_row_ = size_.width() * kBytesPerPixel;
|
| size_t buffer_size = size_.width() * size_.height() * kBytesPerPixel;
|
| ptr_.reset(new uint8[buffer_size]);
|
| @@ -49,14 +49,14 @@ class VideoFrameBuffer {
|
| }
|
| }
|
|
|
| - gfx::Size size() const { return size_; }
|
| + SkISize size() const { return size_; }
|
| int bytes_per_row() const { return bytes_per_row_; }
|
| uint8* ptr() const { return ptr_.get(); }
|
|
|
| void set_needs_update() { needs_update_ = true; }
|
|
|
| private:
|
| - gfx::Size size_;
|
| + SkISize size_;
|
| int bytes_per_row_;
|
| scoped_array<uint8> ptr_;
|
| bool needs_update_;
|
| @@ -77,11 +77,11 @@ class CapturerLinux : public Capturer {
|
| virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
|
| virtual void ClearInvalidRegion() OVERRIDE;
|
| virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
|
| - virtual void InvalidateScreen(const gfx::Size& size) OVERRIDE;
|
| + virtual void InvalidateScreen(const SkISize& size) OVERRIDE;
|
| virtual void InvalidateFullScreen() OVERRIDE;
|
| virtual void CaptureInvalidRegion(CaptureCompletedCallback* callback)
|
| OVERRIDE;
|
| - virtual const gfx::Size& size_most_recent() const OVERRIDE;
|
| + virtual const SkISize& size_most_recent() const OVERRIDE;
|
|
|
| private:
|
| void InitXDamage();
|
| @@ -254,7 +254,7 @@ void CapturerLinux::InvalidateRegion(const SkRegion& invalid_region) {
|
| helper_.InvalidateRegion(invalid_region);
|
| }
|
|
|
| -void CapturerLinux::InvalidateScreen(const gfx::Size& size) {
|
| +void CapturerLinux::InvalidateScreen(const SkISize& size) {
|
| helper_.InvalidateScreen(size);
|
| }
|
|
|
| @@ -499,7 +499,7 @@ void CapturerLinux::SlowBlit(uint8* image, const SkIRect& rect,
|
| }
|
| }
|
|
|
| -const gfx::Size& CapturerLinux::size_most_recent() const {
|
| +const SkISize& CapturerLinux::size_most_recent() const {
|
| return helper_.size_most_recent();
|
| }
|
|
|
|
|