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

remoting/client/rectangle_update_decoder.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/client/rectangle_update_decoder.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "remoting/base/decoder.h"
 #include "remoting/base/decoder_row_based.h"
 #include "remoting/base/decoder_vp8.h"
 #include "remoting/base/util.h"
 #include "remoting/client/frame_consumer.h"
 #include "remoting/protocol/session_config.h"
 
 using remoting::protocol::ChannelConfig;
 using remoting::protocol::SessionConfig;
 
 namespace remoting {
 
 class PartialFrameCleanup : public Task {
  public:
-  PartialFrameCleanup(media::VideoFrame* frame, UpdatedRects* rects,
+  PartialFrameCleanup(media::VideoFrame* frame, RectVector* rects,
                       RectangleUpdateDecoder* decoder)
       : frame_(frame), rects_(rects), decoder_(decoder) {
   }
 
   virtual void Run() {
     delete rects_;
     frame_ = NULL;
 
     // There maybe pending request to refresh rectangles.
     decoder_->OnFrameConsumed();
     decoder_ = NULL;
   }
 
  private:
   scoped_refptr<media::VideoFrame> frame_;
-  UpdatedRects* rects_;
+  RectVector* rects_;
   scoped_refptr<RectangleUpdateDecoder> decoder_;
 };
 
 RectangleUpdateDecoder::RectangleUpdateDecoder(MessageLoop* message_loop,
                                                FrameConsumer* consumer)
     : message_loop_(message_loop),
       consumer_(consumer),
       frame_is_new_(false),
       frame_is_consuming_(false) {
 }
 
 RectangleUpdateDecoder::~RectangleUpdateDecoder() {
 }
 
 void RectangleUpdateDecoder::Initialize(const SessionConfig& config) {
-  initial_screen_size_ = gfx::Size(config.initial_resolution().width,
-                                   config.initial_resolution().height);
+  initial_screen_size_ = SkISize::Make(config.initial_resolution().width,
+                                       config.initial_resolution().height);
 
   // Initialize decoder based on the selected codec.
   ChannelConfig::Codec codec = config.video_config().codec;
   if (codec == ChannelConfig::CODEC_VERBATIM) {
     decoder_.reset(DecoderRowBased::CreateVerbatimDecoder());
   } else if (codec == ChannelConfig::CODEC_ZIP) {
     decoder_.reset(DecoderRowBased::CreateZlibDecoder());
   } else if (codec == ChannelConfig::CODEC_VP8) {
     decoder_.reset(new DecoderVp8());
   } else {
@@ skipping 24 matching lines @@
         NewRunnableMethod(
             this,
             &RectangleUpdateDecoder::AllocateFrame, packet, done));
     return;
   }
   base::ScopedTaskRunner done_runner(done);
 
   // Find the required frame size.
   bool has_screen_size = packet->format().has_screen_width() &&
                          packet->format().has_screen_height();
-  gfx::Size screen_size(packet->format().screen_width(),
-                        packet->format().screen_height());
+  SkISize screen_size(SkISize::Make(packet->format().screen_width(),
+                                    packet->format().screen_height()));
   if (!has_screen_size)
     screen_size = initial_screen_size_;
 
   // Find the current frame size.
-  gfx::Size frame_size(0, 0);
-  if (frame_)
-    frame_size = gfx::Size(static_cast<int>(frame_->width()),
-                           static_cast<int>(frame_->height()));
+  int width = 0;
+  int height = 0;
+  if (frame_) {
+    width = static_cast<int>(frame_->width());
+    height = static_cast<int>(frame_->height());
+  }
+
+  SkISize frame_size(SkISize::Make(width, height));
 
   // Allocate a new frame, if necessary.
   if ((!frame_) || (has_screen_size && (screen_size != frame_size))) {
     if (frame_) {
       consumer_->ReleaseFrame(frame_);
       frame_ = NULL;
     }
 
     consumer_->AllocateFrame(media::VideoFrame::RGB32,
                              screen_size.width(), screen_size.height(),
@@ skipping 47 matching lines @@
                           vertical_ratio));
     return;
   }
 
   // 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.
   decoder_->SetScaleRatios(horizontal_ratio, vertical_ratio);
 }
 
-void RectangleUpdateDecoder::UpdateClipRect(const gfx::Rect& new_clip_rect) {
+void RectangleUpdateDecoder::UpdateClipRect(const SkIRect& new_clip_rect) {
   if (message_loop_ != MessageLoop::current()) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(
             this,
             &RectangleUpdateDecoder::UpdateClipRect, new_clip_rect));
     return;
   }
 
   if (new_clip_rect == clip_rect_ || !decoder_.get())
     return;
 
   // Find out the rectangles to show because of clip rect is updated.
-  if (new_clip_rect.y() < clip_rect_.y()) {
+  if (new_clip_rect.fTop < clip_rect_.fTop) {
     refresh_rects_.push_back(
-        gfx::Rect(new_clip_rect.x(),
-                  new_clip_rect.y(),
-                  new_clip_rect.width(),
-                  clip_rect_.y() - new_clip_rect.y()));
+        SkIRect::MakeXYWH(new_clip_rect.fLeft,
+                          new_clip_rect.fTop,
+                          new_clip_rect.width(),
+                          clip_rect_.fTop - new_clip_rect.fTop));
   }
 
-  if (new_clip_rect.x() < clip_rect_.x()) {
+  if (new_clip_rect.fLeft < clip_rect_.fLeft) {
     refresh_rects_.push_back(
-        gfx::Rect(new_clip_rect.x(),
-                  clip_rect_.y(),
-                  clip_rect_.x() - new_clip_rect.x(),
-                  clip_rect_.height()));
+        SkIRect::MakeXYWH(new_clip_rect.fLeft,
+                          clip_rect_.fTop,
+                          clip_rect_.fLeft - new_clip_rect.fLeft,
+                          clip_rect_.height()));
   }
 
-  if (new_clip_rect.right() > clip_rect_.right()) {
+  if (new_clip_rect.fRight > clip_rect_.fRight) {
     refresh_rects_.push_back(
-        gfx::Rect(clip_rect_.right(),
-                  clip_rect_.y(),
-                  new_clip_rect.right() - clip_rect_.right(),
-                  new_clip_rect.height()));
+        SkIRect::MakeXYWH(clip_rect_.fRight,
+                          clip_rect_.fTop,
+                          new_clip_rect.fRight - clip_rect_.fRight,
+                          new_clip_rect.height()));
   }
 
-  if (new_clip_rect.bottom() > clip_rect_.bottom()) {
+  if (new_clip_rect.fBottom > clip_rect_.fBottom) {
     refresh_rects_.push_back(
-        gfx::Rect(new_clip_rect.x(),
-                  clip_rect_.bottom(),
-                  new_clip_rect.width(),
-                  new_clip_rect.bottom() - clip_rect_.bottom()));
+        SkIRect::MakeXYWH(new_clip_rect.fLeft,
+                          clip_rect_.fBottom,
+                          new_clip_rect.width(),
+                          new_clip_rect.fBottom - clip_rect_.fBottom));
   }
 
   clip_rect_ = new_clip_rect;
   decoder_->SetClipRect(new_clip_rect);
   DoRefresh();
 }
 
 void RectangleUpdateDecoder::RefreshFullFrame() {
   if (message_loop_ != MessageLoop::current()) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &RectangleUpdateDecoder::RefreshFullFrame));
     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;
 
   refresh_rects_.push_back(
-      gfx::Rect(0, 0, static_cast<int>(frame_->width()),
-                static_cast<int>(frame_->height())));
+      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;
 
-  UpdatedRects* dirty_rects = new UpdatedRects();
+  RectVector* dirty_rects = new RectVector();
   decoder_->GetUpdatedRects(dirty_rects);
 
   frame_is_consuming_ = true;
   consumer_->OnPartialFrameOutput(
       frame_, dirty_rects,
       new PartialFrameCleanup(frame_, dirty_rects, this));
 }
 
 void RectangleUpdateDecoder::DoRefresh() {
   DCHECK_EQ(message_loop_, MessageLoop::current());
@@ skipping 12 matching lines @@
         FROM_HERE,
         NewRunnableMethod(this, &RectangleUpdateDecoder::OnFrameConsumed));
     return;
   }
 
   frame_is_consuming_ = false;
   DoRefresh();
 }
 
 }  // namespace remoting