Rename paint data structures

chrome/browser/download/download_shelf.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.
 
 #define _USE_MATH_DEFINES  // For VC++ to get M_PI. This has to be first.
 
 #include "chrome/browser/download/download_shelf.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "cc/paint/paint_flags.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 39 matching lines @@
 
 // Download progress painting --------------------------------------------------
 
 // static
 void DownloadShelf::PaintDownloadProgress(
     gfx::Canvas* canvas,
     const ui::ThemeProvider& theme_provider,
     const base::TimeDelta& progress_time,
     int percent_done) {
   // Draw background (light blue circle).
-  SkPaint bg_paint;
-  bg_paint.setStyle(SkPaint::kFill_Style);
+  cc::PaintFlags bg_paint;
+  bg_paint.setStyle(cc::PaintFlags::kFill_Style);
   SkColor indicator_color =
       theme_provider.GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
   bg_paint.setColor(SkColorSetA(indicator_color, 0x33));
   bg_paint.setAntiAlias(true);
   const SkScalar kCenterPoint = kProgressIndicatorSize / 2.f;
   SkPath bg;
   bg.addCircle(kCenterPoint, kCenterPoint, kCenterPoint);
   canvas->DrawPath(bg, bg_paint);
 
   // Calculate progress.
   SkScalar sweep_angle = 0.f;
   // Start at 12 o'clock.
   SkScalar start_pos = SkIntToScalar(270);
   if (percent_done < 0) {
     // For unknown size downloads, draw a 50 degree sweep that moves at
     // 0.08 degrees per millisecond.
     sweep_angle = 50.f;
     start_pos += static_cast<SkScalar>(progress_time.InMilliseconds() * 0.08);
   } else if (percent_done > 0) {
     sweep_angle = static_cast<SkScalar>(360 * percent_done / 100.0);
   }
 
   // Draw progress.
   SkPath progress;
   progress.addArc(
       SkRect::MakeLTRB(0, 0, kProgressIndicatorSize, kProgressIndicatorSize),
       start_pos, sweep_angle);
-  SkPaint progress_paint;
+  cc::PaintFlags progress_paint;
   progress_paint.setColor(indicator_color);
-  progress_paint.setStyle(SkPaint::kStroke_Style);
+  progress_paint.setStyle(cc::PaintFlags::kStroke_Style);
   progress_paint.setStrokeWidth(1.7f);
   progress_paint.setAntiAlias(true);
   canvas->DrawPath(progress, progress_paint);
 }
 
 // static
 void DownloadShelf::PaintDownloadComplete(
     gfx::Canvas* canvas,
     const ui::ThemeProvider& theme_provider,
     double animation_progress) {
@@ skipping 111 matching lines @@
   content::DownloadManager* download_manager = GetDownloadManager();
   if (!download_manager)
     return;
 
   DownloadItem* download = download_manager->GetDownload(download_id);
   if (!download)
     return;
 
   ShowDownload(download);
 }