ui: Clean up naming of paint-related identifiers

ui/gfx/nine_image_painter.cc

 // Copyright 2014 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/nine_image_painter.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 25 matching lines @@
     return 0;
   return rep.pixel_height();
 }
 
 void Fill(Canvas* c,
           const ImageSkiaRep& rep,
           int x,
           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
 
 NineImagePainter::NineImagePainter(const std::vector<ImageSkia>& images) {
   DCHECK_EQ(arraysize(images_), images.size());
   for (size_t i = 0; i < arraysize(images_); ++i)
     images_[i] = images[i];
 }
 
@@ skipping 90 matching lines @@
   i7h = std::min(i7h, height_in_pixels - i1h);
   i8h = std::min(i8h, height_in_pixels - i2h);
 
   int i4x = std::min(std::min(i0w, i3w), i6w);
   int i4y = std::min(std::min(i0h, i1h), i2h);
   int i4w =
       std::max(width_in_pixels - i4x - std::min(std::min(i2w, i5w), i8w), 0);
   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
 void NineImagePainter::GetSubsetRegions(const ImageSkia& image,
                                         const Insets& insets,
                                         std::vector<Rect>* regions) {
   DCHECK_GE(image.width(), insets.width());
   DCHECK_GE(image.height(), insets.height());
 
   std::vector<Rect> result(9);
 
   const int x[] = {
       0, insets.left(), image.width() - insets.right(), image.width()};
   const int y[] = {
       0, insets.top(), image.height() - insets.bottom(), image.height()};
 
   for (size_t j = 0; j < 3; ++j) {
     for (size_t i = 0; i < 3; ++i) {
       result[i + j * 3] = Rect(x[i], y[j], x[i + 1] - x[i], y[j + 1] - y[j]);
     }
   }
   result.swap(*regions);
 }
 
 }  // namespace gfx