cc: Clean up naming of paint-related identifiers

cc/test/fake_recording_source.h

 // Copyright 2015 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 CC_TEST_FAKE_RECORDING_SOURCE_H_
 #define CC_TEST_FAKE_RECORDING_SOURCE_H_
 
 #include <stddef.h>
 
 #include "cc/base/region.h"
@@ skipping 60 matching lines @@
     scoped_refptr<DisplayItemList> display_list =
         client_.PaintContentsToDisplayList(
             ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
     size_t painter_reported_memory_usage =
         client_.GetApproximateUnsharedMemoryUsage();
     UpdateAndExpandInvalidation(&invalidation, size_, new_recorded_viewport);
     UpdateDisplayItemList(display_list, painter_reported_memory_usage);
   }
 
   void add_draw_rect(const gfx::Rect& rect) {
-    client_.add_draw_rect(rect, default_paint_);
+    client_.add_draw_rect(rect, default_flags_);
   }
 
-  void add_draw_rect_with_paint(const gfx::Rect& rect,
-                                const PaintFlags& paint) {
-    client_.add_draw_rect(rect, paint);
+  void add_draw_rect_with_flags(const gfx::Rect& rect,
+                                const PaintFlags& flags) {
+    client_.add_draw_rect(rect, flags);
   }
 
   void add_draw_rectf(const gfx::RectF& rect) {
-    client_.add_draw_rectf(rect, default_paint_);
+    client_.add_draw_rectf(rect, default_flags_);
   }
 
-  void add_draw_rectf_with_paint(const gfx::RectF& rect,
-                                 const PaintFlags& paint) {
-    client_.add_draw_rectf(rect, paint);
+  void add_draw_rectf_with_flags(const gfx::RectF& rect,
+                                 const PaintFlags& flags) {
+    client_.add_draw_rectf(rect, flags);
   }
 
   void add_draw_image(sk_sp<const SkImage> image, const gfx::Point& point) {
-    client_.add_draw_image(std::move(image), point, default_paint_);
+    client_.add_draw_image(std::move(image), point, default_flags_);
   }
 
   void add_draw_image_with_transform(sk_sp<const SkImage> image,
                                      const gfx::Transform& transform) {
     client_.add_draw_image_with_transform(std::move(image), transform,
-                                          default_paint_);
+                                          default_flags_);
   }
 
-  void add_draw_image_with_paint(sk_sp<const SkImage> image,
+  void add_draw_image_with_flags(sk_sp<const SkImage> image,
                                  const gfx::Point& point,
-                                 const PaintFlags& paint) {
-    client_.add_draw_image(std::move(image), point, paint);
+                                 const PaintFlags& flags) {
+    client_.add_draw_image(std::move(image), point, flags);
   }
 
-  void set_default_paint(const PaintFlags& paint) { default_paint_ = paint; }
+  void set_default_flags(const PaintFlags& flags) { default_flags_ = flags; }
 
   void set_reported_memory_usage(size_t reported_memory_usage) {
     client_.set_reported_memory_usage(reported_memory_usage);
   }
 
   void reset_draws() {
     client_ = FakeContentLayerClient();
     client_.set_bounds(size_);
   }
 
   void SetPlaybackAllowedEvent(base::WaitableEvent* event) {
     playback_allowed_event_ = event;
   }
 
   // Checks that the basic properties of the |other| match |this|.  For the
   // DisplayItemList, it checks that the painted result matches the painted
   // result of |other|.
   bool EqualsTo(const FakeRecordingSource& other);
 
  private:
   FakeContentLayerClient client_;
-  PaintFlags default_paint_;
+  PaintFlags default_flags_;
   base::WaitableEvent* playback_allowed_event_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_RECORDING_SOURCE_H_