Clean up naming of paint-related identifiers

chrome/browser/ui/views/status_bubble_views.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 "chrome/browser/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/paint/paint_flags.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #include "services/service_manager/runner/common/client_util.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 #include "ui/base/theme_provider.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/point.h"
@@ skipping 416 matching lines @@
   // further and further outside the window as the scale increases.
   const int inset = shadow_thickness_pixels - 1;
   bubble_rect.Inset(style_ == STYLE_STANDARD_RIGHT ? 0 : inset, 0,
                     style_ == STYLE_STANDARD_RIGHT ? inset : 0, inset);
   // Align to pixel centers now that the layout is correct.
   bubble_rect.Inset(0.5, 0.5);
 
   SkPath path;
   path.addRoundRect(gfx::RectFToSkRect(bubble_rect), rad);
 
-  cc::PaintFlags paint;
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setStrokeWidth(1);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setStrokeWidth(1);
+  flags.setAntiAlias(true);
 
   SkPath stroke_path;
-  paint.getFillPath(path, &stroke_path);
+  flags.getFillPath(path, &stroke_path);
 
   // Get the fill path by subtracting the shadow so they align neatly.
   SkPath fill_path;
   Op(path, stroke_path, kDifference_SkPathOp, &fill_path);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
   const SkColor bubble_color =
       theme_provider_->GetColor(ThemeProperties::COLOR_TOOLBAR);
-  paint.setColor(bubble_color);
-  canvas->sk_canvas()->drawPath(fill_path, paint);
+  flags.setColor(bubble_color);
+  canvas->sk_canvas()->drawPath(fill_path, flags);
 
-  paint.setColor(kShadowColor);
-  canvas->sk_canvas()->drawPath(stroke_path, paint);
+  flags.setColor(kShadowColor);
+  canvas->sk_canvas()->drawPath(stroke_path, flags);
 
   canvas->Restore();
 
   // Compute text bounds.
   gfx::Rect text_rect(kTextPositionX, 0,
                       popup_size_.width() - kTextHorizPadding,
                       popup_size_.height());
   text_rect.Inset(kShadowThickness, kShadowThickness);
   // Make sure the text is aligned to the right on RTL UIs.
   text_rect.set_x(GetMirroredXForRect(text_rect));
@@ skipping 463 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }