Switch over to using SkRegions to calculate dirty areas.

remoting/host/capturer_helper.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/capturer_helper.h"
 
-#include <algorithm>
-#include <iterator>
-
 namespace remoting {
 
 CapturerHelper::CapturerHelper() : size_most_recent_(0, 0) {
 }
 
 CapturerHelper::~CapturerHelper() {
 }
 
-void CapturerHelper::ClearInvalidRects() {
-  base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
-  inval_rects_.clear();
+void CapturerHelper::ClearInvalidRegion() {
+  base::AutoLock auto_inval_region_lock(inval_region_lock_);
+  inval_region_.setEmpty();
 }
 
-void CapturerHelper::InvalidateRects(const InvalidRects& inval_rects) {
-  base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
-  InvalidRects temp_rects;
-  std::set_union(inval_rects_.begin(), inval_rects_.end(),
-                 inval_rects.begin(), inval_rects.end(),
-                 std::inserter(temp_rects, temp_rects.begin()));
-  inval_rects_.swap(temp_rects);
+void CapturerHelper::InvalidateRegion(const SkRegion& inval_region) {
+  base::AutoLock auto_inval_region_lock(inval_region_lock_);
+  inval_region_.op(inval_region, SkRegion::kUnion_Op);
 }
 
 void CapturerHelper::InvalidateScreen(const gfx::Size& size) {
-  base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
-  inval_rects_.clear();
-  inval_rects_.insert(gfx::Rect(0, 0, size.width(), size.height()));
+  base::AutoLock auto_inval_region_lock(inval_region_lock_);
+  inval_region_.setRect(SkIRect::MakeWH(size.width(), size.height()));

[Wez, 2011/08/08 20:49:34]

nit: Technically this should be a union operation.

[dmac, 2011/08/10 20:30:36]

Done.

 }
 
 void CapturerHelper::InvalidateFullScreen() {
   if (size_most_recent_ != gfx::Size(0, 0))
     InvalidateScreen(size_most_recent_);
 }
 
 bool CapturerHelper::IsCaptureFullScreen(const gfx::Size& size) {
-  base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
-  return inval_rects_.size() == 1u &&
-      inval_rects_.begin()->x() == 0 && inval_rects_.begin()->y() == 0 &&
-      inval_rects_.begin()->width() == size.width() &&
-      inval_rects_.begin()->height() == size.height();
+  base::AutoLock auto_inval_region_lock(inval_region_lock_);
+  const SkIRect& bounds = inval_region_.getBounds();
+  return bounds.fLeft == 0 && bounds.fTop == 0 &&
+      bounds.width() == size.width() && bounds.height() == size.height();

[Wez, 2011/08/08 20:49:34]

This will return true if the capture consists of two small rectangles at
opposite corners of the desktop.  Need to check that there is exactly one
rectangle in the region.

On the other hand, the IsCaptureFullScreen and InvalidateFullScreen logic looks
like it can just be got-rid of entirely.

[Wez, 2011/08/08 20:49:34]

See above.

[dmac, 2011/08/10 20:30:36]

Added bug and comment.

 }
 
-void CapturerHelper::SwapInvalidRects(InvalidRects& inval_rects) {
-  base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
-  inval_rects.swap(inval_rects_);
+void CapturerHelper::SwapInvalidRegion(SkRegion& inval_region) {
+  base::AutoLock auto_inval_region_lock(inval_region_lock_);
+  inval_region.swap(inval_region_);
 }
 
 const gfx::Size& CapturerHelper::size_most_recent() const {
   return size_most_recent_;
 }
 
 void CapturerHelper::set_size_most_recent(const gfx::Size& size) {
   size_most_recent_ = size;
 }
 
 }  // namespace remoting