Fix cc/paint skia type mismatches

chrome/browser/chromeos/display/overscan_calibrator.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/chromeos/display/overscan_calibrator.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 21 matching lines @@
 
 // The gap between the boundary and calibration arrows.
 const int kArrowGapWidth = 0;
 
 // Draw the arrow for the overscan calibration to |canvas|.
 void DrawTriangle(int x_offset,
                   int y_offset,
                   double rotation_degree,
                   gfx::Canvas* canvas) {
   // Draw triangular arrows.
-  SkPaint content_paint;
-  content_paint.setStyle(SkPaint::kFill_Style);
-  content_paint.setColor(SkColorSetA(
+  cc::PaintFlags content_flags;
+  content_flags.setStyle(cc::PaintFlags::kFill_Style);
+  content_flags.setColor(SkColorSetA(
       SK_ColorBLACK, std::numeric_limits<uint8_t>::max() * kArrowOpacity));
-  SkPaint border_paint;
-  border_paint.setStyle(SkPaint::kStroke_Style);
-  border_paint.setColor(SkColorSetA(
+  cc::PaintFlags border_flags;
+  border_flags.setStyle(cc::PaintFlags::kStroke_Style);
+  border_flags.setColor(SkColorSetA(
       SK_ColorWHITE, std::numeric_limits<uint8_t>::max() * kArrowOpacity));
 
   SkPath base_path;
   base_path.moveTo(0, 0);
   base_path.lineTo(SkIntToScalar(-kCalibrationArrowHeight),
                    SkIntToScalar(-kCalibrationArrowHeight));
   base_path.lineTo(SkIntToScalar(kCalibrationArrowHeight),
                    SkIntToScalar(-kCalibrationArrowHeight));
   base_path.close();
 
   SkPath path;
   gfx::Transform rotate_transform;
   rotate_transform.Rotate(rotation_degree);
   gfx::Transform move_transform;
   move_transform.Translate(x_offset, y_offset);
   rotate_transform.ConcatTransform(move_transform);
   base_path.transform(rotate_transform.matrix(), &path);
 
-  canvas->DrawPath(path, content_paint);
-  canvas->DrawPath(path, border_paint);
+  canvas->DrawPath(path, content_flags);
+  canvas->DrawPath(path, border_flags);
 }
 
 }  // namespace
 
 OverscanCalibrator::OverscanCalibrator(const display::Display& target_display,
                                        const gfx::Insets& initial_insets)
     : display_(target_display),
       insets_(initial_insets),
       initial_insets_(initial_insets),
       committed_(false) {
@@ skipping 72 matching lines @@
     const gfx::Rect& damage_rect_in_dip) {
 }
 
 void OverscanCalibrator::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   // TODO(mukai): Cancel the overscan calibration when the device
   // configuration has changed.
 }
 
 }  // namespace chromeos