| Index: remoting/client/frame_producer.h
|
| diff --git a/remoting/client/frame_producer.h b/remoting/client/frame_producer.h
|
| index 14bf283faa7523b424030a93abffa3822b72112c..aa7e63de17d6eec57054ff704d06a67d3a2aacd3 100644
|
| --- a/remoting/client/frame_producer.h
|
| +++ b/remoting/client/frame_producer.h
|
| @@ -6,12 +6,12 @@
|
| #define REMOTING_CLIENT_FRAME_PRODUCER_H_
|
|
|
| #include "base/callback_forward.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"
|
|
|
| namespace webrtc {
|
| class DesktopFrame;
|
| +class DesktopRect;
|
| +class DesktopRegion;
|
| +class DesktopSize;
|
| } // namespace webrtc
|
|
|
| namespace remoting {
|
| @@ -31,7 +31,7 @@ class FrameProducer {
|
| // Requests repainting of the specified |region| of the frame as soon as
|
| // possible. |region| is specified in output coordinates relative to
|
| // the beginning of the frame.
|
| - virtual void InvalidateRegion(const SkRegion& region) = 0;
|
| + virtual void InvalidateRegion(const webrtc::DesktopRegion& region) = 0;
|
|
|
| // Requests returing of all pending buffers to the consumer via
|
| // FrameConsumer::ReturnBuffer() calls.
|
| @@ -39,11 +39,11 @@ class FrameProducer {
|
|
|
| // Notifies the producer of changes to the output view size or clipping area.
|
| // Implementations must cope with empty |view_size| or |clip_area|.
|
| - virtual void SetOutputSizeAndClip(const SkISize& view_size,
|
| - const SkIRect& clip_area) = 0;
|
| + virtual void SetOutputSizeAndClip(const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRect& clip_area) = 0;
|
|
|
| // Returns a reference to the shape of the most recently drawn buffer.
|
| - virtual const SkRegion* GetBufferShape() = 0;
|
| + virtual const webrtc::DesktopRegion* GetBufferShape() = 0;
|
|
|
| protected:
|
| virtual ~FrameProducer() {}
|
|
|