Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: ui/gfx/native_theme_base.cc

Issue 9544001: ui: Let skia do the conversion work for us by using the integer version of set() function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: peter review Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/native_theme_android.cc ('k') | ui/gfx/native_theme_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_theme_base.cc
diff --git a/ui/gfx/native_theme_base.cc b/ui/gfx/native_theme_base.cc
index 2448d1826704853351c79bade2f1a3969b4f4538..035563153874672fd98476d8ea6521af5c12a299 100644
--- a/ui/gfx/native_theme_base.cc
+++ b/ui/gfx/native_theme_base.cc
@@ -520,10 +520,8 @@ void NativeThemeBase::PaintButton(SkCanvas* canvas,
const int kLightEnd = state == kPressed ? 1 : 0;
const int kDarkEnd = !kLightEnd;
SkPoint gradient_bounds[2];
- gradient_bounds[kLightEnd].set(SkIntToScalar(rect.x()),
- SkIntToScalar(rect.y()));
- gradient_bounds[kDarkEnd].set(SkIntToScalar(rect.x()),
- SkIntToScalar(kBottom - 1));
+ gradient_bounds[kLightEnd].iset(rect.x(), rect.y());
+ gradient_bounds[kDarkEnd].iset(rect.x(), kBottom - 1);
SkColor colors[2];
colors[0] = light_color;
colors[1] = base_color;
@@ -804,25 +802,20 @@ void NativeThemeBase::PaintProgressBar(SkCanvas* canvas,
int dest_left_border_width = static_cast<int>(left_border_image->width() *
tile_scale);
- SkRect dest_rect = {
- SkIntToScalar(rect.x()),
- SkIntToScalar(rect.y()),
- SkIntToScalar(rect.x() + dest_left_border_width),
- SkIntToScalar(rect.bottom())
- };
+ SkRect dest_rect;
+ dest_rect.iset(rect.x(), rect.y(), rect.x() + dest_left_border_width,
+ rect.bottom());
canvas->drawBitmapRect(*left_border_image, NULL, dest_rect);
int dest_right_border_width = static_cast<int>(right_border_image->width() *
tile_scale);
- dest_rect.set(SkIntToScalar(rect.right() - dest_right_border_width),
- SkIntToScalar(rect.y()),
- SkIntToScalar(rect.right()),
- SkIntToScalar(rect.bottom()));
+ dest_rect.iset(rect.right() - dest_right_border_width, rect.y(), rect.right(),
+ rect.bottom());
canvas->drawBitmapRect(*right_border_image, NULL, dest_rect);
}
-bool NativeThemeBase::IntersectsClipRectInt(
- SkCanvas* canvas, int x, int y, int w, int h) const {
+bool NativeThemeBase::IntersectsClipRectInt(SkCanvas* canvas,
+ int x, int y, int w, int h) const {
SkRect clip;
return canvas->getClipBounds(&clip) &&
clip.intersect(SkIntToScalar(x), SkIntToScalar(y), SkIntToScalar(x + w),
« no previous file with comments | « ui/gfx/native_theme_android.cc ('k') | ui/gfx/native_theme_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698