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

remoting/client/plugin/pepper_view.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
@@ skipping 91 matching lines @@
   if (host_size_ == host_size)
     return;
 
   host_size_ = host_size;
 
   // Submit an update of desktop size to Javascript.
   instance_->GetScriptableObject()->SetDesktopSize(
       host_size.width(), host_size.height());
 }
 
-void PepperView::PaintFrame(media::VideoFrame* frame, const SkRegion& region) {
+void PepperView::PaintFrame(media::VideoFrame* frame, RectVector* rects) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
 
   SetHostSize(SkISize::Make(frame->width(), frame->height()));
 
   if (!backing_store_.get() || backing_store_->is_null()) {
     LOG(ERROR) << "Backing store is not available.";
     return;
   }
 
   base::Time start_time = base::Time::Now();
 
   // Copy updated regions to the backing store and then paint the regions.
   bool changes_made = false;
-  for (SkRegion::Iterator i(region); !i.done(); i.next())
-    changes_made |= PaintRect(frame, i.rect());
+  for (size_t i = 0; i < rects->size(); ++i)
+    changes_made |= PaintRect(frame, (*rects)[i]);
 
   if (changes_made)
     FlushGraphics(start_time);
 }
 
 bool PepperView::PaintRect(media::VideoFrame* frame, const SkIRect& r) {
   const uint8* frame_data = frame->data(media::VideoFrame::kRGBPlane);
   const int kFrameStride = frame->stride(media::VideoFrame::kRGBPlane);
   const int kBytesPerPixel = GetBytesPerPixel(media::VideoFrame::RGB32);
 
@@ skipping 167 matching lines @@
 }
 
 void PepperView::ReleaseFrame(media::VideoFrame* frame) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
 
   if (frame)
     frame->Release();
 }
 
 void PepperView::OnPartialFrameOutput(media::VideoFrame* frame,
-                                      SkRegion* region,
+                                      RectVector* rects,
                                       const base::Closure& done) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
 
   // TODO(ajwong): Clean up this API to be async so we don't need to use a
   // member variable as a hack.
-  PaintFrame(frame, *region);
+  PaintFrame(frame, rects);
   done.Run();
 }
 
 void PepperView::OnPaintDone(base::Time paint_start) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
   instance_->GetStats()->video_paint_ms()->Record(
       (base::Time::Now() - paint_start).InMilliseconds());
 
   // If the last flush failed because there was already another one in progress
   // then we perform the flush now.
   if (flush_blocked_)
     FlushGraphics(base::Time::Now());
   return;
 }
 
 }  // namespace remoting