Rename paint data structures

ash/magnifier/partial_magnification_controller.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 "ash/magnifier/partial_magnification_controller.h"
 
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/shell.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 87 matching lines @@
 
   ~ContentMask() override { layer_.set_delegate(nullptr); }
 
   ui::Layer* layer() { return &layer_; }
 
  private:
   // ui::LayerDelegate:
   void OnPaintLayer(const ui::PaintContext& context) override {
     ui::PaintRecorder recorder(context, layer()->size());
 
-    SkPaint paint;
+    cc::PaintFlags paint;
     paint.setAlpha(255);
     paint.setAntiAlias(true);
     // Stroke is used for clipping the border which consists of the rendered
     // border |kBorderSize| and the magnifier shadow |kShadowThickness| and
     // |kShadowOffset|.
     paint.setStrokeWidth(kBorderSize + kShadowThickness + kShadowOffset);
-    paint.setStyle(is_border_ ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
+    paint.setStyle(is_border_ ? cc::PaintFlags::kStroke_Style
+                              : cc::PaintFlags::kFill_Style);
 
     // If we want to clip the magnifier zone use the magnifiers radius.
     // Otherwise we want to clip the border, shadow and shadow offset so we
     // start
     // at the halfway point of the stroke width.
     gfx::Rect rect(layer()->bounds().size());
     int clipping_radius = kMagnifierRadius;
     if (is_border_)
       clipping_radius += (kShadowThickness + kShadowOffset + kBorderSize) / 2;
     recorder.canvas()->DrawCircle(rect.CenterPoint(), clipping_radius, paint);
@@ skipping 25 matching lines @@
   }
 
   ~BorderRenderer() override {}
 
  private:
   // ui::LayerDelegate:
   void OnPaintLayer(const ui::PaintContext& context) override {
     ui::PaintRecorder recorder(context, magnifier_window_bounds_.size());
 
     // Draw the shadow.
-    SkPaint shadow_paint;
+    cc::PaintFlags shadow_paint;
     shadow_paint.setAntiAlias(true);
     shadow_paint.setColor(SK_ColorTRANSPARENT);
     shadow_paint.setLooper(
         gfx::CreateShadowDrawLooperCorrectBlur(magnifier_shadows_));
     gfx::Rect shadow_bounds(magnifier_window_bounds_.size());
     recorder.canvas()->DrawCircle(
         shadow_bounds.CenterPoint(),
         shadow_bounds.width() / 2 - kShadowThickness - kShadowOffset,
         shadow_paint);
 
-    SkPaint border_paint;
+    cc::PaintFlags border_paint;
     border_paint.setAntiAlias(true);
-    border_paint.setStyle(SkPaint::kStroke_Style);
+    border_paint.setStyle(cc::PaintFlags::kStroke_Style);
 
     // The radius of the magnifier and its border.
     const int magnifier_radius = kMagnifierRadius + kBorderSize;
 
     // Draw the inner border.
     border_paint.setStrokeWidth(kBorderSize);
     border_paint.setColor(kBorderColor);
     recorder.canvas()->DrawCircle(magnifier_window_bounds_.CenterPoint(),
                                   magnifier_radius - kBorderSize / 2,
                                   border_paint);
@@ skipping 187 matching lines @@
 
 void PartialMagnificationController::RemoveZoomWidgetObservers() {
   DCHECK(host_widget_);
   host_widget_->RemoveObserver(this);
   aura::Window* root_window = host_widget_->GetNativeView()->GetRootWindow();
   DCHECK(root_window);
   root_window->RemoveObserver(this);
 }
 
 }  // namespace ash