Switch over to using SkRegions to calculate dirty areas.

remoting/host/x_server_pixel_buffer.cc

 // Copyright (c) 2011 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 "remoting/host/x_server_pixel_buffer.h"
 
 #include <gdk/gdk.h>
 #include <sys/shm.h>
 
 #include "base/logging.h"
@@ skipping 130 matching lines @@
 
 void XServerPixelBuffer::Synchronize() {
   if (shm_segment_info_ && !shm_pixmap_) {
     // XShmGetImage can fail if the display is being reconfigured.
     gdk_error_trap_push();
     XShmGetImage(display_, root_window_, x_image_, 0, 0, AllPlanes);
     gdk_error_trap_pop();
   }
 }
 
-uint8* XServerPixelBuffer::CaptureRect(const gfx::Rect& rect) {
+uint8* XServerPixelBuffer::CaptureRect(const SkIRect& rect) {
   if (shm_segment_info_) {
     if (shm_pixmap_) {
       XCopyArea(display_, root_window_, shm_pixmap_, shm_gc_,
-                rect.x(), rect.y(), rect.width(), rect.height(),
-                rect.x(), rect.y());
+                rect.fLeft, rect.fTop, rect.width(), rect.height(),
+                rect.fLeft, rect.fTop);
       XSync(display_, False);
     }
     return reinterpret_cast<uint8*>(x_image_->data) +
-        rect.y() * x_image_->bytes_per_line +
-        rect.x() * x_image_->bits_per_pixel / 8;
+        rect.fTop * x_image_->bytes_per_line +
+        rect.fLeft * x_image_->bits_per_pixel / 8;
   } else {
     if (x_image_)
       XDestroyImage(x_image_);
-    x_image_ = XGetImage(display_, root_window_, rect.x(), rect.y(),
+    x_image_ = XGetImage(display_, root_window_, rect.fLeft, rect.fTop,
                          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 26 matching lines @@
 
 int XServerPixelBuffer::GetGreenShift() const {
   return ffs(x_image_->green_mask) - 1;
 }
 
 bool XServerPixelBuffer::IsRgb() const {
   return GetRedShift() == 16 && GetGreenShift() == 8 && GetBlueShift() == 0;
 }
 
 }  // namespace remoting