Revert 118790 - Compile error due to missing operator== on SkRegion

remoting/client/rectangle_update_decoder.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 "remoting/client/rectangle_update_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 122 matching lines @@
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::SetOutputSize,
                               this, size));
     return;
   }
 
   // TODO(wez): Refresh the frame only if the ratio has changed.
   if (frame_) {
     SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height());
-    refresh_region_.op(frame_rect, SkRegion::kUnion_Op);
+    refresh_rects_.push_back(frame_rect);
   }
 
   // TODO(hclam): If the scale ratio has changed we should reallocate a
   // VideoFrame of different size. However if the scale ratio is always
   // smaller than 1.0 we can use the same video frame.
   if (decoder_.get()) {
     decoder_->SetOutputSize(size);
     RefreshFullFrame();
   }
 }
 
 void RectangleUpdateDecoder::UpdateClipRect(const SkIRect& new_clip_rect) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::UpdateClipRect,
                               this, new_clip_rect));
     return;
   }
 
   if (new_clip_rect == clip_rect_ || !decoder_.get())
     return;
 
   // TODO(wez): Only refresh newly-exposed portions of the frame.
   if (frame_) {
     SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height());
-    refresh_region_.op(frame_rect, SkRegion::kUnion_Op);
+    refresh_rects_.push_back(frame_rect);
   }
 
   clip_rect_ = new_clip_rect;
   decoder_->SetClipRect(new_clip_rect);
 
   // TODO(wez): Defer refresh so that multiple events can be batched.
   DoRefresh();
 }
 
 void RectangleUpdateDecoder::RefreshFullFrame() {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::RefreshFullFrame, this));
     return;
   }
 
   // If a video frame or the decoder is not allocated yet then don't
   // save the refresh rectangle to avoid wasted computation.
   if (!frame_ || !decoder_.get())
     return;
 
-  SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height());
-  refresh_region_.op(frame_rect, SkRegion::kUnion_Op);
-
+  refresh_rects_.push_back(
+      SkIRect::MakeWH(static_cast<int>(frame_->width()),
+                      static_cast<int>(frame_->height())));
   DoRefresh();
 }
 
 void RectangleUpdateDecoder::SubmitToConsumer() {
   // A frame is not allocated yet, we can reach here because of a refresh
   // request.
   if (!frame_)
     return;
 
-  SkRegion* dirty_region = new SkRegion;
-  decoder_->GetUpdatedRegion(dirty_region);
+  RectVector* dirty_rects = new RectVector();
+  decoder_->GetUpdatedRects(dirty_rects);
 
-  consumer_->OnPartialFrameOutput(frame_, dirty_region, base::Bind(
-      &RectangleUpdateDecoder::OnFrameConsumed, this, dirty_region));
+  consumer_->OnPartialFrameOutput(frame_, dirty_rects, base::Bind(
+      &RectangleUpdateDecoder::OnFrameConsumed, this, dirty_rects));
 }
 
 void RectangleUpdateDecoder::DoRefresh() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
-  if (refresh_region_.isEmpty())
+  if (refresh_rects_.empty())
     return;
 
-  decoder_->RefreshRegion(refresh_region_);
-  refresh_region_.setEmpty();
+  decoder_->RefreshRects(refresh_rects_);
+  refresh_rects_.clear();
   SubmitToConsumer();
 }
 
-void RectangleUpdateDecoder::OnFrameConsumed(SkRegion* region) {
+void RectangleUpdateDecoder::OnFrameConsumed(RectVector* rects) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::OnFrameConsumed,
-                              this, region));
+                              this, rects));
     return;
   }
 
-  delete region;
+  delete rects;
 
   DoRefresh();
 }
 
 }  // namespace remoting