Move us fully from gfx:: over to skia types for consistency.

remoting/base/decoder_row_based.cc

-// Copyright (c) 2010 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/base/decoder_row_based.h"
 
 #include "remoting/base/decompressor.h"
 #include "remoting/base/decompressor_zlib.h"
 #include "remoting/base/decompressor_verbatim.h"
 #include "remoting/base/util.h"
 
@@ skipping 69 matching lines @@
     return DECODE_ERROR;
   }
 
   const uint8* in = reinterpret_cast<const uint8*>(packet->data().data());
   const int in_size = packet->data().size();
 
   const int row_size = clip_.width() * kBytesPerPixel;
   int stride = frame_->stride(media::VideoFrame::kRGBPlane);
   uint8* rect_begin = frame_->data(media::VideoFrame::kRGBPlane);
 
-  uint8* out = rect_begin + stride * (clip_.y() + row_y_) +
-      kBytesPerPixel * clip_.x();
+  uint8* out = rect_begin + stride * (clip_.fTop + row_y_) +
+      kBytesPerPixel * clip_.fLeft;
 
   // Consume all the data in the message.
   bool decompress_again = true;
   int used = 0;
   while (decompress_again && used < in_size) {
     if (row_y_ >= clip_.height()) {
       state_ = kError;
       LOG(WARNING) << "Too much data is received for the given rectangle.";
       return DECODE_ERROR;
     }
@@ skipping 41 matching lines @@
 
   if (packet->flags() & VideoPacket::FIRST_PACKET) {
     if (state_ != kReady && state_ != kDone && state_ != kPartitionDone) {
       state_ = kError;
       LOG(WARNING) << "Received unexpected FIRST_PACKET.";
       return;
     }
     state_ = kProcessing;
 
     // Reset the buffer location status variables on the first packet.
-    clip_.SetRect(packet->format().x(), packet->format().y(),
+    clip_.setXYWH(packet->format().x(), packet->format().y(),
                   packet->format().width(), packet->format().height());
     row_pos_ = 0;
     row_y_ = 0;
   }
 
   if (state_ != kProcessing) {
     state_ = kError;
     LOG(WARNING) << "Received unexpected packet.";
     return;
   }
@@ skipping 12 matching lines @@
       state_ = kError;
       LOG(WARNING) << "Received unexpected LAST_PARTITION.";
       return;
     }
     state_ = kDone;
   }
 
   return;
 }
 
-void DecoderRowBased::GetUpdatedRects(UpdatedRects* rects) {
+void DecoderRowBased::GetUpdatedRects(RectVector* rects) {
   rects->swap(updated_rects_);
   updated_rects_.clear();
 }
 
 VideoPacketFormat::Encoding DecoderRowBased::Encoding() {
   return encoding_;
 }
 
 }  // namespace remoting