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

Unified Diff: ash/common/frame/caption_buttons/frame_caption_button.cc

Issue 2679423002: ash: 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 | « ash/common/accelerators/exit_warning_handler.cc ('k') | ash/common/frame/default_header_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/caption_buttons/frame_caption_button.cc
diff --git a/ash/common/frame/caption_buttons/frame_caption_button.cc b/ash/common/frame/caption_buttons/frame_caption_button.cc
index ca34392586983fb3e12d257d3430f44dfac59e11..0d26e0d626890eef84974bd746c8f5cd0d56820e 100644
--- a/ash/common/frame/caption_buttons/frame_caption_button.cc
+++ b/ash/common/frame/caption_buttons/frame_caption_button.cc
@@ -127,13 +127,13 @@ void FrameCaptionButton::OnPaint(gfx::Canvas* canvas) {
if (crossfade_icon_alpha > 0 && !crossfade_icon_image_.isNull()) {
gfx::Canvas icon_canvas(icon_image_.size(), canvas->image_scale(), false);
- cc::PaintFlags paint;
- paint.setAlpha(icon_alpha);
- icon_canvas.DrawImageInt(icon_image_, 0, 0, paint);
+ cc::PaintFlags flags;
+ flags.setAlpha(icon_alpha);
+ icon_canvas.DrawImageInt(icon_image_, 0, 0, flags);
- paint.setAlpha(crossfade_icon_alpha);
- paint.setBlendMode(SkBlendMode::kPlus);
- icon_canvas.DrawImageInt(crossfade_icon_image_, 0, 0, paint);
+ flags.setAlpha(crossfade_icon_alpha);
+ flags.setBlendMode(SkBlendMode::kPlus);
+ icon_canvas.DrawImageInt(crossfade_icon_image_, 0, 0, flags);
PaintCentered(canvas, gfx::ImageSkia(icon_canvas.ExtractImageRep()),
alpha_);
@@ -182,10 +182,10 @@ void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
alpha *= inactive_alpha;
}
- cc::PaintFlags paint;
- paint.setAlpha(alpha);
+ cc::PaintFlags flags;
+ flags.setAlpha(alpha);
canvas->DrawImageInt(to_center, (width() - to_center.width()) / 2,
- (height() - to_center.height()) / 2, paint);
+ (height() - to_center.height()) / 2, flags);
}
} // namespace ash
« no previous file with comments | « ash/common/accelerators/exit_warning_handler.cc ('k') | ash/common/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698