Initial pass at integrating Differ into the chromoting host code....

remoting/host/capturer_mac.cc

 // Copyright (c) 2010 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/capturer_mac.h"
 
 #include <stddef.h>
 
 #include <OpenGL/CGLMacro.h>
 
@@ skipping 53 matching lines @@
                                       &pixel_format,
                                       &matching_pixel_format_count);
   DCHECK_EQ(err, kCGLNoError);
   err = CGLCreateContext(pixel_format, NULL, &cgl_context_);
   DCHECK_EQ(err, kCGLNoError);
   CGLDestroyPixelFormat(pixel_format);
   CGLSetFullScreen(cgl_context_);
   CGLSetCurrentContext(cgl_context_);
 }
 
-void CapturerMac::CaptureRects(const RectVector& rects,
+void CapturerMac::CalculateInvalidRects() {
+  // Since the Mac gets its list of invalid rects via calls to InvalidateRect(),
+  // this step only needs to perform post-processing optimizations on the rect
+  // list (if needed).
+}
+
+void CapturerMac::CaptureRects(const InvalidRects& rects,
                                CaptureCompletedCallback* callback) {
   // TODO(dmaclach): something smarter here in the future.
   gfx::Rect dirtyRect;
-  for (RectVector::const_iterator i = rects.begin(); i < rects.end(); ++i) {
+  for (InvalidRects::const_iterator i = rects.begin(); i != rects.end(); ++i) {
     dirtyRect = dirtyRect.Union(*i);
   }
 
   CGLContextObj CGL_MACRO_CONTEXT = cgl_context_;
   glReadBuffer(GL_FRONT);
   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
 
   glPixelStorei(GL_PACK_ALIGNMENT, 4);  // Force 4-byte alignment.
   glPixelStorei(GL_PACK_ROW_LENGTH, 0);
   glPixelStorei(GL_PACK_SKIP_ROWS, 0);
   glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
 
   // Read a block of pixels from the frame buffer.
   glReadPixels(0, 0, width(), height(), GL_BGRA, GL_UNSIGNED_BYTE,
                buffers_[current_buffer_].get());
   glPopClientAttrib();
 
   DataPlanes planes;
   planes.data[0] = buffers_[current_buffer_].get();
   planes.strides[0] = bytes_per_row_;
 
   scoped_refptr<CaptureData> data(new CaptureData(planes,
                                                   width(),
                                                   height(),
                                                   pixel_format()));
-  data->mutable_dirty_rects().assign(1, dirtyRect);
+  data->mutable_dirty_rects().clear();
+  data->mutable_dirty_rects().insert(dirtyRect);
   FinishCapture(data, callback);
 }
 
-
 void CapturerMac::ScreenRefresh(CGRectCount count, const CGRect *rect_array) {
-  RectVector rects;
+  InvalidRects rects;
   for (CGRectCount i = 0; i < count; ++i) {
     CGRect rect = rect_array[i];
     rect.origin.y = height() - rect.size.height;
-    rects.push_back(gfx::Rect(rect));
+    rects.insert(gfx::Rect(rect));
   }
   InvalidateRects(rects);
-
 }
 
 void CapturerMac::ScreenUpdateMove(CGScreenUpdateMoveDelta delta,
                                    size_t count,
                                    const CGRect *rect_array) {
-  RectVector rects;
+  InvalidRects rects;
   for (CGRectCount i = 0; i < count; ++i) {
     CGRect rect = rect_array[i];
     rect.origin.y = height() - rect.size.height;
-    rects.push_back(gfx::Rect(rect));
+    rects.insert(gfx::Rect(rect));
     rect = CGRectOffset(rect, delta.dX, delta.dY);
-    rects.push_back(gfx::Rect(rect));
+    rects.insert(gfx::Rect(rect));
   }
   InvalidateRects(rects);
 }
 
 void CapturerMac::ScreenRefreshCallback(CGRectCount count,
                                         const CGRect *rect_array,
                                         void *user_parameter) {
   CapturerMac *capturer = reinterpret_cast<CapturerMac *>(user_parameter);
   capturer->ScreenRefresh(count, rect_array);
 }
@@ skipping 11 matching lines @@
     CGDisplayChangeSummaryFlags flags,
     void *user_parameter) {
   if ((display == CGMainDisplayID()) &&
       !(flags & kCGDisplayBeginConfigurationFlag)) {
     CapturerMac *capturer = reinterpret_cast<CapturerMac *>(user_parameter);
     capturer->ScreenConfigurationChanged();
   }
 }
 
 }  // namespace remoting