ui/gfx: Simplify RectToSkRect() implementation by using iset() function.

ui/gfx/skia_util.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/skia_util.h"
 
 #include "base/i18n/char_iterator.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 
 SkRect RectToSkRect(const gfx::Rect& rect) {
   SkRect r;
-  r.set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()),
-        SkIntToScalar(rect.right()), SkIntToScalar(rect.bottom()));
+  r.iset(rect.x(), rect.y(), rect.right(), rect.bottom());
   return r;
 }
 
 SkIRect RectToSkIRect(const gfx::Rect& rect) {
   SkIRect r = { rect.x(), rect.y(), rect.right(), rect.bottom() };
   return r;
 }
 
 gfx::Rect SkRectToRect(const SkRect& rect) {
-  return gfx::Rect(static_cast<int>(rect.fLeft),
-                   static_cast<int>(rect.fTop),
+  return gfx::Rect(static_cast<int>(rect.left()),
+                   static_cast<int>(rect.top()),
                    static_cast<int>(rect.width()),
                    static_cast<int>(rect.height()));
 }
 
 SkShader* CreateGradientShader(int start_point,
                                int end_point,
                                SkColor start_color,
                                SkColor end_color) {
   SkColor grad_colors[2] = { start_color, end_color};
   SkPoint grad_points[2];
@@ skipping 16 matching lines @@
   bitmap1.unlockPixels();
 
   bitmap2.lockPixels();
   addr2 = bitmap2.getAddr32(0, 0);
   size2 = bitmap2.getSize();
   bitmap2.unlockPixels();
 
   return (size1 == size2) && (0 == memcmp(addr1, addr2, bitmap1.getSize()));
 }
 
 string16 RemoveAcceleratorChar(const string16& s,

[tfarina, 2012/02/28 16:31:33]

Is there a better place for this function? It doesn't seem to fit in a skia_util
component. 

[Peter Kasting, 2012/02/28 19:18:22]

I have no idea.  Don't know who uses it or who added it.  I agree with you that
it seems misplaced.

                                char16 accelerator_char,
                                int *accelerated_char_pos,
                                int *accelerated_char_span) {
   bool escaped = false;
   int last_char_pos = -1;
   int last_char_span = 0;
   base::i18n::UTF16CharIterator chars(&s);
   string16 accelerator_removed;
 
   accelerator_removed.reserve(s.size());
@@ skipping 18 matching lines @@
 
   if (accelerated_char_pos)
     *accelerated_char_pos = last_char_pos;
   if (accelerated_char_span)
     *accelerated_char_span = last_char_span;
 
   return accelerator_removed;
 }
 
 }  // namespace gfx