Use webrtc::DesktopCapturer for screen capturer implementation.

media/video/capture/screen/x11/x_server_pixel_buffer.cc

 // 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.
 
 #include "media/video/capture/screen/x11/x_server_pixel_buffer.h"
 
 #include <sys/shm.h>
 
 #include "base/logging.h"
 
@@ skipping 42 matching lines @@
 }
 
 #endif  // !defined(TOOLKIT_GTK)
 
 }  // namespace
 
 namespace media {
 
 XServerPixelBuffer::XServerPixelBuffer()
     : display_(NULL), root_window_(0),
-      root_window_size_(SkISize::Make(0, 0)), x_image_(NULL),
+      x_image_(NULL),
       shm_segment_info_(NULL), shm_pixmap_(0), shm_gc_(NULL) {
 }
 
 XServerPixelBuffer::~XServerPixelBuffer() {
   Release();
 }
 
 void XServerPixelBuffer::Release() {
   if (x_image_) {
     XDestroyImage(x_image_);
@@ skipping 11 matching lines @@
     if (shm_segment_info_->shmaddr != reinterpret_cast<char*>(-1))
       shmdt(shm_segment_info_->shmaddr);
     if (shm_segment_info_->shmid != -1)
       shmctl(shm_segment_info_->shmid, IPC_RMID, 0);
     delete shm_segment_info_;
     shm_segment_info_ = NULL;
   }
 }
 
 void XServerPixelBuffer::Init(Display* display,
-                              const SkISize& screen_size) {
+                              const webrtc::DesktopSize& screen_size) {
   Release();
   display_ = display;
   root_window_size_ = screen_size;
   int default_screen = DefaultScreen(display_);
   root_window_ = RootWindow(display_, default_screen);
   InitShm(default_screen);
 }
 
 // static
-SkISize XServerPixelBuffer::GetRootWindowSize(Display* display) {
+webrtc::DesktopSize XServerPixelBuffer::GetRootWindowSize(Display* display) {
   XWindowAttributes root_attr;
   XGetWindowAttributes(display, DefaultRootWindow(display), &root_attr);
-  return SkISize::Make(root_attr.width, root_attr.height);
+  return webrtc::DesktopSize(root_attr.width, root_attr.height);
 }
 
 void XServerPixelBuffer::InitShm(int screen) {
   Visual* default_visual = DefaultVisual(display_, screen);
   int default_depth = DefaultDepth(display_, screen);
 
   int major, minor;
   Bool havePixmaps;
   if (!XShmQueryVersion(display_, &major, &minor, &havePixmaps))
     // Shared memory not supported. CaptureRect will use the XImage API instead.
@@ skipping 85 matching lines @@
 
 void XServerPixelBuffer::Synchronize() {
   if (shm_segment_info_ && !shm_pixmap_) {
     // XShmGetImage can fail if the display is being reconfigured.
     EnableXServerErrorTrap();
     XShmGetImage(display_, root_window_, x_image_, 0, 0, AllPlanes);
     GetLastXServerError();
   }
 }
 
-uint8* XServerPixelBuffer::CaptureRect(const SkIRect& rect) {
-  DCHECK(SkIRect::MakeSize(root_window_size_).contains(rect));
+uint8* XServerPixelBuffer::CaptureRect(const webrtc::DesktopRect& rect) {
+  DCHECK_LE(rect.right(), root_window_size_.width());
+  DCHECK_LE(rect.bottom(), root_window_size_.height());
+
   if (shm_segment_info_) {
     if (shm_pixmap_) {
       XCopyArea(display_, root_window_, shm_pixmap_, shm_gc_,
-                rect.fLeft, rect.fTop, rect.width(), rect.height(),
-                rect.fLeft, rect.fTop);
+                rect.left(), rect.top(), rect.width(), rect.height(),
+                rect.left(), rect.top());
       XSync(display_, False);
     }
     return reinterpret_cast<uint8*>(x_image_->data) +
-        rect.fTop * x_image_->bytes_per_line +
-        rect.fLeft * x_image_->bits_per_pixel / 8;
+        rect.top() * x_image_->bytes_per_line +
+        rect.left() * x_image_->bits_per_pixel / 8;
   } else {
     if (x_image_)
       XDestroyImage(x_image_);
-    x_image_ = XGetImage(display_, root_window_, rect.fLeft, rect.fTop,
+    x_image_ = XGetImage(display_, root_window_, rect.left(), rect.top(),
                          rect.width(), rect.height(), AllPlanes, ZPixmap);
     return reinterpret_cast<uint8*>(x_image_->data);
   }
 }
 
 int XServerPixelBuffer::GetStride() const {
   return x_image_->bytes_per_line;
 }
 
 int XServerPixelBuffer::GetDepth() const {
@@ skipping 10 matching lines @@
 
 int XServerPixelBuffer::GetBlueMask() const {
   return x_image_->blue_mask;
 }
 
 int XServerPixelBuffer::GetGreenMask() const {
   return x_image_->green_mask;
 }
 
 }  // namespace media