Revert 50784 - Canvas refactoring part 3....

chrome/browser/download/download_util.cc

 // Copyright (c) 2010 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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
 #endif
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/time_format.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 #if defined(TOOLKIT_VIEWS)
@@ skipping 177 matching lines @@
         SkShader::CreateBitmapShader(*foreground,
                                      SkShader::kClamp_TileMode,
                                      SkShader::kClamp_TileMode);
     SkMatrix shader_scale;
     shader_scale.setTranslate(SkIntToScalar(foreground_bounds.x()),
                               SkIntToScalar(foreground_bounds.y()));
     shader->setLocalMatrix(shader_scale);
     foreground_paint.setShader(shader);
     foreground_paint.setAntiAlias(true);
     shader->unref();
-    canvas->AsCanvasSkia()->drawPath(path, foreground_paint);
+    canvas->drawPath(path, foreground_paint);
     return;
   }
 
   canvas->DrawBitmapInt(*foreground,
                         foreground_bounds.x(),
                         foreground_bounds.y(),
                         foreground_paint);
 }
 
 void PaintDownloadComplete(gfx::Canvas* canvas,
@@ skipping 25 matching lines @@
   // at zero opacity.
   static const double PI = 3.141592653589793;
   double opacity = sin(animation_progress * PI * kCompleteAnimationCycles +
                    PI/2) / 2 + 0.5;
 
   SkRect bounds;
   bounds.set(SkIntToScalar(complete_bounds.x()),
              SkIntToScalar(complete_bounds.y()),
              SkIntToScalar(complete_bounds.x() + complete_bounds.width()),
              SkIntToScalar(complete_bounds.y() + complete_bounds.height()));
-  canvas->AsCanvasSkia()->saveLayerAlpha(
-      &bounds,
-      static_cast<int>(255.0 * opacity),
-      SkCanvas::kARGB_ClipLayer_SaveFlag);
-  canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+  canvas->saveLayerAlpha(&bounds,
+                         static_cast<int>(255.0 * opacity),
+                         SkCanvas::kARGB_ClipLayer_SaveFlag);
+  canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
   canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y());
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 }
 
 // Load a language dependent height so that the dangerous download confirmation
 // message doesn't overlap with the download link label.
 int GetBigProgressIconSize() {
   static int big_progress_icon_size = 0;
   if (big_progress_icon_size == 0) {
     string16 locale_size_str =
         WideToUTF16Hack(l10n_util::GetString(IDS_DOWNLOAD_BIG_PROGRESS_SIZE));
     bool rc = StringToInt(locale_size_str, &big_progress_icon_size);
@@ skipping 226 matching lines @@
     AppendNumberToPath(&new_path, count);
 
     if (!file_util::PathExists(new_path))
       return count;
   }
 
   return -1;
 }
 
 }  // namespace download_util