ui/gfx: Convert Canvas::ClipRectInt() to use gfx::Rect.

ui/gfx/canvas_direct2d.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 "ui/gfx/canvas_direct2d.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/brush.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 155 matching lines @@
     rt_->PopAxisAlignedClip();
 
   state_.pop();
   // The state_ stack should never be empty - we should always have at least one
   // entry to hold a clip count when there is no active save/restore entry.
   CHECK(!state_.empty()) << "Called Restore() once too often!";
 
   rt_->RestoreDrawingState(drawing_state_block_);
 }
 
-bool CanvasDirect2D::ClipRectInt(int x, int y, int w, int h) {
-  rt_->PushAxisAlignedClip(RectToRectF(x, y, w, h),
-                           D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
+bool CanvasDirect2D::ClipRectInt(const gfx::Rect& rect) {
+  rt_->PushAxisAlignedClip(
+      RectToRectF(rect.x(), rect.y(), rect.width(), rect.height()),

[Peter Kasting, 2011/10/25 20:24:47]

Nit: Just RectToRectF(rect) should work.

[tfarina, 2011/10/25 23:52:41]

Done.

+      D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
   // Increment the clip count so the call to PushAxisAlignedClip() can be
   // balanced with a call to PopAxisAlignedClip in the next Restore().
   ++state_.top().clip_count;
-  return w > 0 && h > 0;
+  return rect.width() > 0 && rect.height() > 0;

[Peter Kasting, 2011/10/25 20:24:47]

Nit: Simpler:

return !rect.IsEmpty();

[tfarina, 2011/10/25 23:52:41]

Done.

 }
 
 void CanvasDirect2D::TranslateInt(int x, int y) {
   D2D1_MATRIX_3X2_F raw;
   rt_->GetTransform(&raw);
   D2D1::Matrix3x2F transform(raw._11, raw._12, raw._21, raw._22, raw._31,
                              raw._32);
   transform = D2D1::Matrix3x2F::Translation(static_cast<float>(x),
                                             static_cast<float>(y)) * transform;
   rt_->SetTransform(transform);
@@ skipping 169 matching lines @@
 // CanvasDirect2D, private:
 
 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) {
   if (!drawing_state_block_)
     GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive());
   rt_->SaveDrawingState(drawing_state_block_.get());
   state_.push(RenderState(layer));
 }
 
 }  // namespace gfx