Revert 224101 "Remove dependency on Skia from chromoting client."

trunk/src/remoting/codec/video_decoder_verbatim.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_
 #define REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/codec/video_decoder.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace remoting {
 
 // Video decoder implementations that decodes video packet encoded by
 // VideoEncoderVerbatim. It just copies data from incoming packets to the
 // video frames.
 class VideoDecoderVerbatim : public VideoDecoder {
  public:
   virtual ~VideoDecoderVerbatim();
 
   VideoDecoderVerbatim();
 
   // VideoDecoder implementation.
   virtual bool IsReadyForData() OVERRIDE;
-  virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
+  virtual void Initialize(const SkISize& screen_size) OVERRIDE;
   virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
   virtual VideoPacketFormat::Encoding Encoding() OVERRIDE;
-  virtual void Invalidate(const webrtc::DesktopSize& view_size,
-                          const webrtc::DesktopRegion& region) OVERRIDE;
-  virtual void RenderFrame(const webrtc::DesktopSize& view_size,
-                           const webrtc::DesktopRect& clip_area,
+  virtual void Invalidate(const SkISize& view_size,
+                          const SkRegion& region) OVERRIDE;
+  virtual void RenderFrame(const SkISize& view_size,
+                           const SkIRect& clip_area,
                            uint8* image_buffer,
                            int image_stride,
-                           webrtc::DesktopRegion* output_region) OVERRIDE;
-  virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE;
+                           SkRegion* output_region) OVERRIDE;
+  virtual const SkRegion* GetImageShape() OVERRIDE;
 
  private:
   // The region updated that hasn't been copied to the screen yet.
-  webrtc::DesktopRegion updated_region_;
+  SkRegion updated_region_;
 
   // Size of the remote screen.
-  webrtc::DesktopSize screen_size_;
+  SkISize screen_size_;
 
   // The bitmap holding the remote screen bits.
   scoped_ptr<uint8[]> screen_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderVerbatim);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_