ui: Clean up naming of paint-related identifiers

ui/gfx/canvas.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/gfx/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 149 matching lines @@
     for (int i = 0; i < row_pixels; i++) {
       for (int u = 0; u < col_pixels; u++) {
         if ((u % 2 + i % 2) % 2 != 0) {
           dot[i * row_pixels + u] = color;
         }
       }
     }
   }
 
   // Make a shader for the bitmap with an origin of the box we'll draw.
-  cc::PaintFlags paint;
-  paint.setShader(cc::WrapSkShader(SkShader::MakeBitmapShader(
+  cc::PaintFlags flags;
+  flags.setShader(cc::WrapSkShader(SkShader::MakeBitmapShader(
       *dots, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode)));
 
-  DrawRect(RectF(rect.x(), rect.y(), rect.width(), 1), paint);
+  DrawRect(RectF(rect.x(), rect.y(), rect.width(), 1), flags);
   DrawRect(RectF(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1),
-           paint);
-  DrawRect(RectF(rect.x(), rect.y(), 1, rect.height()), paint);
+           flags);
+  DrawRect(RectF(rect.x(), rect.y(), 1, rect.height()), flags);
   DrawRect(RectF(rect.x() + rect.width() - 1, rect.y(), 1, rect.height()),
-           paint);
+           flags);
 }
 
 float Canvas::UndoDeviceScaleFactor() {
   SkScalar scale_factor = 1.0f / image_scale_;
   canvas_->scale(scale_factor, scale_factor);
   return image_scale_;
 }
 
 void Canvas::Save() {
   canvas_->save();
@@ skipping 52 matching lines @@
 
 void Canvas::DrawColor(SkColor color, SkBlendMode mode) {
   canvas_->drawColor(color, mode);
 }
 
 void Canvas::FillRect(const Rect& rect, SkColor color) {
   FillRect(rect, color, SkBlendMode::kSrcOver);
 }
 
 void Canvas::FillRect(const Rect& rect, SkColor color, SkBlendMode mode) {
-  cc::PaintFlags paint;
-  paint.setColor(color);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
-  paint.setBlendMode(mode);
-  DrawRect(rect, paint);
+  cc::PaintFlags flags;
+  flags.setColor(color);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setBlendMode(mode);
+  DrawRect(rect, flags);
 }
 
 void Canvas::DrawRect(const Rect& rect, SkColor color) {
   DrawRect(RectF(rect), color);
 }
 
 void Canvas::DrawRect(const RectF& rect, SkColor color) {
   DrawRect(rect, color, SkBlendMode::kSrcOver);
 }
 
 void Canvas::DrawRect(const Rect& rect, SkColor color, SkBlendMode mode) {
   DrawRect(RectF(rect), color, mode);
 }
 
 void Canvas::DrawRect(const RectF& rect, SkColor color, SkBlendMode mode) {
-  cc::PaintFlags paint;
-  paint.setColor(color);
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
+  cc::PaintFlags flags;
+  flags.setColor(color);
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
   // Set a stroke width of 0, which will put us down the stroke rect path.  If
   // we set a stroke width of 1, for example, this will internally create a
   // path and fill it, which causes problems near the edge of the canvas.
-  paint.setStrokeWidth(SkIntToScalar(0));
-  paint.setBlendMode(mode);
+  flags.setStrokeWidth(SkIntToScalar(0));
+  flags.setBlendMode(mode);
 
-  DrawRect(rect, paint);
+  DrawRect(rect, flags);
 }
 
-void Canvas::DrawRect(const Rect& rect, const cc::PaintFlags& paint) {
-  DrawRect(RectF(rect), paint);
+void Canvas::DrawRect(const Rect& rect, const cc::PaintFlags& flags) {
+  DrawRect(RectF(rect), flags);
 }
 
-void Canvas::DrawRect(const RectF& rect, const cc::PaintFlags& paint) {
-  canvas_->drawRect(RectFToSkRect(rect), paint);
+void Canvas::DrawRect(const RectF& rect, const cc::PaintFlags& flags) {
+  canvas_->drawRect(RectFToSkRect(rect), flags);
 }
 
-void Canvas::DrawPoint(const Point& p1, const cc::PaintFlags& paint) {
-  DrawPoint(PointF(p1), paint);
+void Canvas::DrawPoint(const Point& p1, const cc::PaintFlags& flags) {
+  DrawPoint(PointF(p1), flags);
 }
 
-void Canvas::DrawPoint(const PointF& p1, const cc::PaintFlags& paint) {
-  canvas_->drawPoint(SkFloatToScalar(p1.x()), SkFloatToScalar(p1.y()), paint);
+void Canvas::DrawPoint(const PointF& p1, const cc::PaintFlags& flags) {
+  canvas_->drawPoint(SkFloatToScalar(p1.x()), SkFloatToScalar(p1.y()), flags);
 }
 
 void Canvas::DrawLine(const Point& p1, const Point& p2, SkColor color) {
   DrawLine(PointF(p1), PointF(p2), color);
 }
 
 void Canvas::DrawLine(const PointF& p1, const PointF& p2, SkColor color) {
-  cc::PaintFlags paint;
-  paint.setColor(color);
-  paint.setStrokeWidth(SkIntToScalar(1));
-  DrawLine(p1, p2, paint);
+  cc::PaintFlags flags;
+  flags.setColor(color);
+  flags.setStrokeWidth(SkIntToScalar(1));
+  DrawLine(p1, p2, flags);
 }
 
 void Canvas::DrawLine(const Point& p1,
                       const Point& p2,
-                      const cc::PaintFlags& paint) {
-  DrawLine(PointF(p1), PointF(p2), paint);
+                      const cc::PaintFlags& flags) {
+  DrawLine(PointF(p1), PointF(p2), flags);
 }
 
 void Canvas::DrawLine(const PointF& p1,
                       const PointF& p2,
-                      const cc::PaintFlags& paint) {
+                      const cc::PaintFlags& flags) {
   canvas_->drawLine(SkFloatToScalar(p1.x()), SkFloatToScalar(p1.y()),
-                    SkFloatToScalar(p2.x()), SkFloatToScalar(p2.y()), paint);
+                    SkFloatToScalar(p2.x()), SkFloatToScalar(p2.y()), flags);
 }
 
 void Canvas::DrawCircle(const Point& center_point,
                         int radius,
-                        const cc::PaintFlags& paint) {
-  DrawCircle(PointF(center_point), radius, paint);
+                        const cc::PaintFlags& flags) {
+  DrawCircle(PointF(center_point), radius, flags);
 }
 
 void Canvas::DrawCircle(const PointF& center_point,
                         float radius,
-                        const cc::PaintFlags& paint) {
+                        const cc::PaintFlags& flags) {
   canvas_->drawCircle(SkFloatToScalar(center_point.x()),
                       SkFloatToScalar(center_point.y()),
-                      SkFloatToScalar(radius), paint);
+                      SkFloatToScalar(radius), flags);
 }
 
 void Canvas::DrawRoundRect(const Rect& rect,
                            int radius,
-                           const cc::PaintFlags& paint) {
-  DrawRoundRect(RectF(rect), radius, paint);
+                           const cc::PaintFlags& flags) {
+  DrawRoundRect(RectF(rect), radius, flags);
 }
 
 void Canvas::DrawRoundRect(const RectF& rect,
                            float radius,
-                           const cc::PaintFlags& paint) {
+                           const cc::PaintFlags& flags) {
   canvas_->drawRoundRect(RectFToSkRect(rect), SkFloatToScalar(radius),
-                         SkFloatToScalar(radius), paint);
+                         SkFloatToScalar(radius), flags);
 }
 
-void Canvas::DrawPath(const SkPath& path, const cc::PaintFlags& paint) {
-  canvas_->drawPath(path, paint);
+void Canvas::DrawPath(const SkPath& path, const cc::PaintFlags& flags) {
+  canvas_->drawPath(path, flags);
 }
 
 void Canvas::DrawFocusRect(const Rect& rect) {
   DrawFocusRect(RectF(rect));
 }
 
 void Canvas::DrawFocusRect(const RectF& rect) {
   DrawDashedRect(rect, SK_ColorGRAY);
 }
 
 void Canvas::DrawSolidFocusRect(const RectF& rect,
                                 SkColor color,
                                 float thickness) {
-  cc::PaintFlags paint;
-  paint.setColor(color);
-  paint.setStrokeWidth(SkFloatToScalar(thickness));
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
+  cc::PaintFlags flags;
+  flags.setColor(color);
+  flags.setStrokeWidth(SkFloatToScalar(thickness));
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
   gfx::RectF draw_rect = rect;
   draw_rect.Inset(gfx::InsetsF(thickness / 2));
-  DrawRect(draw_rect, paint);
+  DrawRect(draw_rect, flags);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image, int x, int y) {
-  cc::PaintFlags paint;
-  DrawImageInt(image, x, y, paint);
+  cc::PaintFlags flags;
+  DrawImageInt(image, x, y, flags);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8_t a) {
-  cc::PaintFlags paint;
-  paint.setAlpha(a);
-  DrawImageInt(image, x, y, paint);
+  cc::PaintFlags flags;
+  flags.setAlpha(a);
+  DrawImageInt(image, x, y, flags);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image,
                           int x,
                           int y,
-                          const cc::PaintFlags& paint) {
+                          const cc::PaintFlags& flags) {
   const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
   if (image_rep.is_null())
     return;
   const SkBitmap& bitmap = image_rep.sk_bitmap();
   float bitmap_scale = image_rep.scale();
 
   ScopedCanvas scoper(this);
   canvas_->scale(SkFloatToScalar(1.0f / bitmap_scale),
                  SkFloatToScalar(1.0f / bitmap_scale));
-  canvas_->drawBitmap(bitmap,
-                      SkFloatToScalar(x * bitmap_scale),
-                      SkFloatToScalar(y * bitmap_scale),
-                      &paint);
+  canvas_->drawBitmap(bitmap, SkFloatToScalar(x * bitmap_scale),
+                      SkFloatToScalar(y * bitmap_scale), &flags);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image,
                           int src_x,
                           int src_y,
                           int src_w,
                           int src_h,
                           int dest_x,
                           int dest_y,
                           int dest_w,
                           int dest_h,
                           bool filter) {
-  cc::PaintFlags p;
-  DrawImageInt(image, src_x, src_y, src_w, src_h, dest_x, dest_y,
-               dest_w, dest_h, filter, p);
+  cc::PaintFlags flags;
+  DrawImageInt(image, src_x, src_y, src_w, src_h, dest_x, dest_y, dest_w,
+               dest_h, filter, flags);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image,
                           int src_x,
                           int src_y,
                           int src_w,
                           int src_h,
                           int dest_x,
                           int dest_y,
                           int dest_w,
                           int dest_h,
                           bool filter,
-                          const cc::PaintFlags& paint) {
+                          const cc::PaintFlags& flags) {
   const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
   if (image_rep.is_null())
     return;
   bool remove_image_scale = true;
   DrawImageIntHelper(image_rep, src_x, src_y, src_w, src_h, dest_x, dest_y,
-                     dest_w, dest_h, filter, paint, remove_image_scale);
+                     dest_w, dest_h, filter, flags, remove_image_scale);
 }
 
 void Canvas::DrawImageIntInPixel(const ImageSkiaRep& image_rep,
                                  int dest_x,
                                  int dest_y,
                                  int dest_w,
                                  int dest_h,
                                  bool filter,
-                                 const cc::PaintFlags& paint) {
+                                 const cc::PaintFlags& flags) {
   int src_x = 0;
   int src_y = 0;
   int src_w = image_rep.pixel_width();
   int src_h = image_rep.pixel_height();
   // Don't remove image scale here, this function is used to draw the
   // (already scaled) |image_rep| at a 1:1 scale with the canvas.
   bool remove_image_scale = false;
   DrawImageIntHelper(image_rep, src_x, src_y, src_w, src_h, dest_x, dest_y,
-                     dest_w, dest_h, filter, paint, remove_image_scale);
+                     dest_w, dest_h, filter, flags, remove_image_scale);
 }
 
 void Canvas::DrawImageInPath(const ImageSkia& image,
                              int x,
                              int y,
                              const SkPath& path,
-                             const cc::PaintFlags& paint) {
+                             const cc::PaintFlags& original_flags) {
   const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
   if (image_rep.is_null())
     return;
 
   SkMatrix matrix;
   matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
-  cc::PaintFlags p(paint);
-  p.setShader(
+  cc::PaintFlags flags(original_flags);
+  flags.setShader(
       CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode, matrix));
-  canvas_->drawPath(path, p);
+  canvas_->drawPath(path, flags);
 }
 
 void Canvas::DrawStringRect(const base::string16& text,
                             const FontList& font_list,
                             SkColor color,
                             const Rect& display_rect) {
   DrawStringRectWithFlags(text, font_list, color, display_rect,
                           DefaultCanvasTextAlignment());
 }
 
@@ skipping 24 matching lines @@
                           int dest_y,
                           int w,
                           int h) {
   SkRect dest_rect = { SkIntToScalar(dest_x),
                        SkIntToScalar(dest_y),
                        SkIntToScalar(dest_x + w),
                        SkIntToScalar(dest_y + h) };
   if (!IntersectsClipRect(dest_rect))
     return;
 
-  cc::PaintFlags paint;
+  cc::PaintFlags flags;
   if (InitPaintFlagsForTiling(image, src_x, src_y, tile_scale_x, tile_scale_y,
-                              dest_x, dest_y, &paint))
-    canvas_->drawRect(dest_rect, paint);
+                              dest_x, dest_y, &flags))
+    canvas_->drawRect(dest_rect, flags);
 }
 
 bool Canvas::InitPaintFlagsForTiling(const ImageSkia& image,
                                      int src_x,
                                      int src_y,
                                      float tile_scale_x,
                                      float tile_scale_y,
                                      int dest_x,
                                      int dest_y,
-                                     cc::PaintFlags* paint) {
+                                     cc::PaintFlags* flags) {
   const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
   if (image_rep.is_null())
     return false;
 
   SkMatrix shader_scale;
   shader_scale.setScale(SkFloatToScalar(tile_scale_x),
                         SkFloatToScalar(tile_scale_y));
   shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
   shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
 
-  paint->setShader(CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode,
+  flags->setShader(CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode,
                                         shader_scale));
-  paint->setBlendMode(SkBlendMode::kSrcOver);
+  flags->setBlendMode(SkBlendMode::kSrcOver);
   return true;
 }
 
 void Canvas::Transform(const gfx::Transform& transform) {
   canvas_->concat(transform.matrix());
 }
 
 bool Canvas::IntersectsClipRect(const SkRect& rect) {
   SkRect clip;
   return canvas_->getLocalClipBounds(&clip) && clip.intersects(rect);
 }
 
 void Canvas::DrawImageIntHelper(const ImageSkiaRep& image_rep,
                                 int src_x,
                                 int src_y,
                                 int src_w,
                                 int src_h,
                                 int dest_x,
                                 int dest_y,
                                 int dest_w,
                                 int dest_h,
                                 bool filter,
-                                const cc::PaintFlags& paint,
+                                const cc::PaintFlags& original_flags,
                                 bool remove_image_scale) {
   DLOG_ASSERT(src_x + src_w < std::numeric_limits<int16_t>::max() &&
               src_y + src_h < std::numeric_limits<int16_t>::max());
   if (src_w <= 0 || src_h <= 0) {
     NOTREACHED() << "Attempting to draw bitmap from an empty rect!";
     return;
   }
 
   SkRect dest_rect = { SkIntToScalar(dest_x),
                        SkIntToScalar(dest_y),
                        SkIntToScalar(dest_x + dest_w),
                        SkIntToScalar(dest_y + dest_h) };
   if (!IntersectsClipRect(dest_rect))
     return;
 
   float user_scale_x = static_cast<float>(dest_w) / src_w;
   float user_scale_y = static_cast<float>(dest_h) / src_h;
 
   // Make a bitmap shader that contains the bitmap we want to draw. This is
   // basically what SkCanvas.drawBitmap does internally, but it gives us
   // more control over quality and will use the mipmap in the source image if
   // it has one, whereas drawBitmap won't.
   SkMatrix shader_scale;
   shader_scale.setScale(SkFloatToScalar(user_scale_x),
                         SkFloatToScalar(user_scale_y));
   shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
   shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
 
-  cc::PaintFlags p(paint);
-  p.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
-  p.setShader(CreateImageRepShaderForScale(
+  cc::PaintFlags flags(original_flags);
+  flags.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
+  flags.setShader(CreateImageRepShaderForScale(
       image_rep, SkShader::kRepeat_TileMode, shader_scale,
       remove_image_scale ? image_rep.scale() : 1.f));
 
   // The rect will be filled by the bitmap.
-  canvas_->drawRect(dest_rect, p);
+  canvas_->drawRect(dest_rect, flags);
 }
 
 }  // namespace gfx