Use webrtc::DesktopCapturer for screen capturer implementation.

remoting/codec/video_encoder_verbatim.h

Index: remoting/codec/video_encoder_verbatim.h
diff --git a/remoting/codec/video_encoder_verbatim.h b/remoting/codec/video_encoder_verbatim.h
index 2b6250b643d4fba02e892c80f58b436e9c9664c5..c07d37c375e9cf41819a1bab40a8262f8ec8991e 100644
--- a/remoting/codec/video_encoder_verbatim.h
+++ b/remoting/codec/video_encoder_verbatim.h
@@ -8,7 +8,7 @@
 #include "base/time.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/proto/video.pb.h"
-#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
@@ -24,17 +24,20 @@ class VideoEncoderVerbatim : public VideoEncoder {
 
   // VideoEncoder interface.
   virtual void Encode(
-      scoped_refptr<media::ScreenCaptureData> capture_data,
-      bool key_frame,
+      webrtc::DesktopFrame* frame,
       const DataAvailableCallback& data_available_callback) OVERRIDE;
 
  private:
   // Encode a single dirty |rect|.
-  void EncodeRect(const SkIRect& rect, bool last);
+  void EncodeRect(webrtc::DesktopFrame* frame,

[Wez, 2013/04/26 18:48:14]

nit: const DesktopFrame*?

[alexeypa (please no reviews), 2013/04/26 21:33:58]

Or rather const DesktopFrame&?

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

[Sergey Ulanov, 2013/05/07 22:25:50]

frames are normally passed by pointer, so I think it's better to use a pointer
here.

+                  const webrtc::DesktopRect& rect,
+                  bool last);
 
   // Initializes first packet in a sequence of video packets to update screen
   // rectangle |rect|.
-  void PrepareUpdateStart(const SkIRect& rect, VideoPacket* packet);
+  void PrepareUpdateStart(webrtc::DesktopFrame* frame,

[Wez, 2013/04/26 18:48:14]

nit: const DesktopFrame*?

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

+                          const webrtc::DesktopRect& rect,
+                          VideoPacket* packet);
 
   // Allocates a buffer of the specified |size| inside |packet| and returns the
   // pointer to it.
@@ -43,12 +46,11 @@ class VideoEncoderVerbatim : public VideoEncoder {
   // Submit |packet| to |callback_|.
   void SubmitMessage(VideoPacket* packet, size_t rect_index);
 
-  scoped_refptr<media::ScreenCaptureData> capture_data_;
   DataAvailableCallback callback_;
   base::Time encode_start_time_;
 
   // The most recent screen size.
-  SkISize screen_size_;
+  webrtc::DesktopSize screen_size_;
 
   int max_packet_size_;
 };