ui: Clean up naming of paint-related identifiers

ui/gfx/render_text.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 72 matching lines @@
   void DrawUnderline(int x, int y, int width);
   void DrawStrike(int x, int y, int width) const;
 
  private:
   friend class test::RenderTextTestApi;
 
   // Helper class to draw a diagonal line with multiple pieces of different
   // lengths and colors; to support text selection appearances.
   class DiagonalStrike {
    public:
-    DiagonalStrike(Canvas* canvas, Point start, const cc::PaintFlags& paint);
+    DiagonalStrike(Canvas* canvas, Point start, const cc::PaintFlags& flags);
     ~DiagonalStrike();
 
     void AddPiece(int length, SkColor color);
     void Draw();
 
    private:
     typedef std::pair<int, SkColor> Piece;
 
     Canvas* canvas_;
     const Point start_;
-    cc::PaintFlags paint_;
+    cc::PaintFlags flags_;
     int total_length_;
     std::vector<Piece> pieces_;
 
     DISALLOW_COPY_AND_ASSIGN(DiagonalStrike);
   };
 
   Canvas* canvas_;
   cc::PaintCanvas* canvas_skia_;
-  cc::PaintFlags paint_;
+  cc::PaintFlags flags_;
   SkScalar underline_thickness_;
   SkScalar underline_position_;
   std::unique_ptr<DiagonalStrike> diagonal_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer);
 };
 
 // Internal helper class used to iterate colors, baselines, and styles.
 class StyleIterator {
  public:
@@ skipping 65 matching lines @@
   // Maximum baseline of all segments on this line.
   int baseline;
 };
 
 // Creates an SkTypeface from a font, |italic| and a desired |weight|.
 // May return null.
 sk_sp<SkTypeface> CreateSkiaTypeface(const Font& font,
                                      bool italic,
                                      Font::Weight weight);
 
-// Applies the given FontRenderParams to a Skia |paint|.
+// Applies the given FontRenderParams to the PaintFlags.
 void ApplyRenderParams(const FontRenderParams& params,
                        bool subpixel_rendering_suppressed,
-                       cc::PaintFlags* paint);
+                       cc::PaintFlags* flags);
 
 }  // namespace internal
 
 // RenderText represents an abstract model of styled text and its corresponding
 // visual layout. Support is built in for a cursor, a selection, simple styling,
 // complex scripts, and bi-directional text. Implementations provide mechanisms
 // for rendering and translation between logical and visual data.
 class GFX_EXPORT RenderText {
  public:
 #if defined(OS_MACOSX)
@@ skipping 670 matching lines @@
   // Lines computed by EnsureLayout. These should be invalidated upon
   // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
   std::vector<internal::Line> lines_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_