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

Unified Diff: ui/gfx/nine_image_painter.cc

Issue 2680943002: ui: Clean up naming of paint-related identifiers (Closed)
Patch Set: Created 3 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/image/image_skia_operations.cc ('k') | ui/gfx/paint_throbber.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/nine_image_painter.cc
diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc
index 60c8d021835ac8d18cdf8fc716480ac0fa09df9d..fa1afe44b03f27611b81cf619b83e5389ae22173 100644
--- a/ui/gfx/nine_image_painter.cc
+++ b/ui/gfx/nine_image_painter.cc
@@ -43,10 +43,10 @@ void Fill(Canvas* c,
int y,
int w,
int h,
- const cc::PaintFlags& paint) {
+ const cc::PaintFlags& flags) {
if (rep.is_null())
return;
- c->DrawImageIntInPixel(rep, x, y, w, h, false, paint);
+ c->DrawImageIntInPixel(rep, x, y, w, h, false, flags);
}
} // namespace
@@ -157,21 +157,21 @@ void NineImagePainter::Paint(Canvas* canvas,
int i4h =
std::max(height_in_pixels - i4y - std::min(std::min(i6h, i7h), i8h), 0);
- cc::PaintFlags paint;
- paint.setAlpha(alpha);
+ cc::PaintFlags flags;
+ flags.setAlpha(alpha);
- Fill(canvas, image_reps[4], i4x, i4y, i4w, i4h, paint);
- Fill(canvas, image_reps[0], 0, 0, i0w, i0h, paint);
- Fill(canvas, image_reps[1], i0w, 0, width_in_pixels - i0w - i2w, i1h, paint);
- Fill(canvas, image_reps[2], width_in_pixels - i2w, 0, i2w, i2h, paint);
- Fill(canvas, image_reps[3], 0, i0h, i3w, height_in_pixels - i0h - i6h, paint);
+ Fill(canvas, image_reps[4], i4x, i4y, i4w, i4h, flags);
+ Fill(canvas, image_reps[0], 0, 0, i0w, i0h, flags);
+ Fill(canvas, image_reps[1], i0w, 0, width_in_pixels - i0w - i2w, i1h, flags);
+ Fill(canvas, image_reps[2], width_in_pixels - i2w, 0, i2w, i2h, flags);
+ Fill(canvas, image_reps[3], 0, i0h, i3w, height_in_pixels - i0h - i6h, flags);
Fill(canvas, image_reps[5], width_in_pixels - i5w, i2h, i5w,
- height_in_pixels - i2h - i8h, paint);
- Fill(canvas, image_reps[6], 0, height_in_pixels - i6h, i6w, i6h, paint);
+ height_in_pixels - i2h - i8h, flags);
+ Fill(canvas, image_reps[6], 0, height_in_pixels - i6h, i6w, i6h, flags);
Fill(canvas, image_reps[7], i6w, height_in_pixels - i7h,
- width_in_pixels - i6w - i8w, i7h, paint);
+ width_in_pixels - i6w - i8w, i7h, flags);
Fill(canvas, image_reps[8], width_in_pixels - i8w, height_in_pixels - i8h,
- i8w, i8h, paint);
+ i8w, i8h, flags);
}
// static
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/gfx/paint_throbber.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698