Make gfx::Rect class operations consistently mutate the class they are called on.

ui/base/native_theme/native_theme_base.cc

 // Copyright (c) 2012 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/base/native_theme/native_theme_base.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 486 matching lines @@
   } else if (button.checked) {
     image = state == kDisabled ?
         rb.GetImageSkiaNamed(IDR_CHECKBOX_DISABLED_ON) :
         rb.GetImageSkiaNamed(IDR_CHECKBOX_ON);
   } else {
     image = state == kDisabled ?
         rb.GetImageSkiaNamed(IDR_CHECKBOX_DISABLED_OFF) :
         rb.GetImageSkiaNamed(IDR_CHECKBOX_OFF);
   }
 
-  gfx::Rect bounds = rect.Center(gfx::Size(image->width(), image->height()));
+  gfx::Rect bounds = rect;
+  bounds.ClampToCenteredSize(gfx::Size(image->width(), image->height()));
   DrawImageInt(canvas, *image, 0, 0, image->width(), image->height(),
       bounds.x(), bounds.y(), bounds.width(), bounds.height());
 }
 
 // Draws the common elements of checkboxes and radio buttons.
 // Returns the rectangle within which any additional decorations should be
 // drawn, or empty if none.
 SkRect NativeThemeBase::PaintCheckboxRadioNewCommon(
     SkCanvas* canvas,
     State state,
@@ skipping 130 matching lines @@
   if (state == kDisabled) {
     image = button.checked ?
         rb.GetImageSkiaNamed(IDR_RADIO_DISABLED_ON) :
         rb.GetImageSkiaNamed(IDR_RADIO_DISABLED_OFF);
   } else {
     image = button.checked ?
         rb.GetImageSkiaNamed(IDR_RADIO_ON) :
         rb.GetImageSkiaNamed(IDR_RADIO_OFF);
   }
 
-  gfx::Rect bounds = rect.Center(gfx::Size(image->width(), image->height()));
+  gfx::Rect bounds = rect;
+  bounds.ClampToCenteredSize(gfx::Size(image->width(), image->height()));
   DrawImageInt(canvas, *image, 0, 0, image->width(), image->height(),
       bounds.x(), bounds.y(), bounds.width(), bounds.height());
 }
 
 void NativeThemeBase::PaintRadioNew(SkCanvas* canvas,
                                   State state,
                                   const gfx::Rect& rect,
                                   const ButtonExtraParams& button) const {
 
   // Most of a radio button is the same as a checkbox, except the the rounded
@@ skipping 455 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace ui