Chromium Code Reviews| Index: remoting/client/frame_consumer.h |
| diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h |
| index b5f937ca5acd07db7098115fcc83eca38d2c2eee..80050342b5feb5b2af12ad37fa31dc5a5e015a4b 100644 |
| --- a/remoting/client/frame_consumer.h |
| +++ b/remoting/client/frame_consumer.h |
| @@ -6,9 +6,8 @@ |
| #define REMOTING_CLIENT_FRAME_CONSUMER_H_ |
| #include "base/basictypes.h" |
| -#include "third_party/skia/include/core/SkRect.h" |
| -#include "third_party/skia/include/core/SkRegion.h" |
| -#include "third_party/skia/include/core/SkSize.h" |
| +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
|
alexeypa (please no reviews)
2013/09/18 23:04:05
nit: Forward declare webrtc::DesktopXxx classes in
Sergey Ulanov
2013/09/18 23:26:58
Done.
|
| +#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" |
| namespace webrtc { |
| class DesktopFrame; |
| @@ -26,10 +25,10 @@ class FrameConsumer { |
| // |
| // N.B. Both |clip_area| and |region| are in output coordinates relative to |
| // the frame. |
| - virtual void ApplyBuffer(const SkISize& view_size, |
| - const SkIRect& clip_area, |
| + virtual void ApplyBuffer(const webrtc::DesktopSize& view_size, |
| + const webrtc::DesktopRect& clip_area, |
| webrtc::DesktopFrame* buffer, |
| - const SkRegion& region) = 0; |
| + const webrtc::DesktopRegion& region) = 0; |
| // Accepts a buffer that couldn't be used for drawing for any reason (shutdown |
| // is in progress, the view area has changed, etc.). The accepted buffer can |
| @@ -37,8 +36,8 @@ class FrameConsumer { |
| virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) = 0; |
| // Set the dimension of the entire host screen. |
| - virtual void SetSourceSize(const SkISize& source_size, |
| - const SkIPoint& dpi) = 0; |
| + virtual void SetSourceSize(const webrtc::DesktopSize& source_size, |
| + const webrtc::DesktopVector& dpi) = 0; |
| protected: |
| FrameConsumer() {} |