Revert 96327 - Switch over to using SkRegions to calculate dirty areas.

remoting/base/encoder_vp8.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/base/encoder_vp8.h"
 
 #include "base/logging.h"
 #include "media/base/callback.h"
 #include "media/base/yuv_convert.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/util.h"
 #include "remoting/proto/video.pb.h"
-#include "third_party/skia/include/core/SkRegion.h"
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "third_party/libvpx/libvpx.h"
 }
 
 namespace {
 
 // Defines the dimension of a macro block. This is used to compute the active
 // map for the encoder.
@@ skipping 118 matching lines @@
 }
 
 bool EncoderVp8::PrepareImage(scoped_refptr<CaptureData> capture_data,
                               std::vector<gfx::Rect>* updated_rects) {
   // Perform RGB->YUV conversion.
   if (capture_data->pixel_format() != media::VideoFrame::RGB32) {
     LOG(ERROR) << "Only RGB32 is supported";
     return false;
   }
 
-  const SkRegion& region = capture_data->dirty_region();
+  const InvalidRects& rects = capture_data->dirty_rects();
   const uint8* in = capture_data->data_planes().data[0];
   const int in_stride = capture_data->data_planes().strides[0];
   const int plane_size =
       capture_data->size().width() * capture_data->size().height();
   uint8* y_out = yuv_image_.get();
   uint8* u_out = yuv_image_.get() + plane_size;
   uint8* v_out = yuv_image_.get() + plane_size + plane_size / 4;
   const int y_stride = image_->stride[0];
   const int uv_stride = image_->stride[1];
 
   DCHECK(updated_rects->empty());
-  for (SkRegion::Iterator r(region); !r.done(); r.next()) {
+  for (InvalidRects::const_iterator r = rects.begin(); r != rects.end(); ++r) {
     // Align the rectangle, report it as updated.
-    SkIRect skRect = r.rect();
-    gfx::Rect rect(skRect.fLeft, skRect.fTop, skRect.width(), skRect.height());
-    rect = AlignAndClipRect(rect, image_->w, image_->h);
+    gfx::Rect rect = AlignAndClipRect(*r, image_->w, image_->h);
     if (!rect.IsEmpty())
       updated_rects->push_back(rect);
 
     ConvertRGB32ToYUVWithRect(in,
                               y_out,
                               u_out,
                               v_out,
                               rect.x(),
                               rect.y(),
                               rect.width(),
@@ skipping 108 matching lines @@
     rect->set_y(updated_rects[i].y());
     rect->set_width(updated_rects[i].width());
     rect->set_height(updated_rects[i].height());
   }
 
   data_available_callback->Run(message);
   delete data_available_callback;
 }
 
 }  // namespace remoting