Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/download_item_view.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.
 
 #include "chrome/browser/views/download_item_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "app/theme_provider.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/views/download_shelf_view.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
@@ skipping 474 matching lines @@
 
   // Paint the background images.
   int x = kLeftPadding;
   bool rtl_ui = base::i18n::IsRTL();
   if (rtl_ui) {
     // Since we do not have the mirrored images for
     // (hot_)body_image_set->top_left, (hot_)body_image_set->left,
     // (hot_)body_image_set->bottom_left, and drop_down_image_set,
     // for RTL UI, we flip the canvas to draw those images mirrored.
     // Consequently, we do not need to mirror the x-axis of those images.
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->TranslateInt(width(), 0);
     canvas->ScaleInt(-1, 1);
   }
   PaintBitmaps(canvas,
                body_image_set->top_left, body_image_set->left,
                body_image_set->bottom_left,
                x, box_y_, box_height_, body_image_set->top_left->width());
   x += body_image_set->top_left->width();
   PaintBitmaps(canvas,
                body_image_set->top, body_image_set->center,
                body_image_set->bottom,
                x, box_y_, box_height_, center_width);
   x += center_width;
   PaintBitmaps(canvas,
                body_image_set->top_right, body_image_set->right,
                body_image_set->bottom_right,
                x, box_y_, box_height_, body_image_set->top_right->width());
 
   // Overlay our body hot state.
   if (body_hover_animation_->GetCurrentValue() > 0) {
-    canvas->AsCanvasSkia()->saveLayerAlpha(NULL,
+    canvas->saveLayerAlpha(NULL,
         static_cast<int>(body_hover_animation_->GetCurrentValue() * 255),
         SkCanvas::kARGB_NoClipLayer_SaveFlag);
-    canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+    canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
 
     int x = kLeftPadding;
     PaintBitmaps(canvas,
                  hot_body_image_set_.top_left, hot_body_image_set_.left,
                  hot_body_image_set_.bottom_left,
                  x, box_y_, box_height_, hot_body_image_set_.top_left->width());
     x += body_image_set->top_left->width();
     PaintBitmaps(canvas,
                  hot_body_image_set_.top, hot_body_image_set_.center,
                  hot_body_image_set_.bottom,
                  x, box_y_, box_height_, center_width);
     x += center_width;
     PaintBitmaps(canvas,
                  hot_body_image_set_.top_right, hot_body_image_set_.right,
                  hot_body_image_set_.bottom_right,
                  x, box_y_, box_height_,
                  hot_body_image_set_.top_right->width());
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
     if (rtl_ui) {
-      canvas->AsCanvasSkia()->restore();
-      canvas->AsCanvasSkia()->save();
+      canvas->restore();
+      canvas->save();
       // Flip it for drawing drop-down images for RTL locales.
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
     }
   }
 
   x += body_image_set->top_right->width();
 
   // Paint the drop-down.
   if (drop_down_image_set) {
     PaintBitmaps(canvas,
                  drop_down_image_set->top, drop_down_image_set->center,
                  drop_down_image_set->bottom,
                  x, box_y_, box_height_, drop_down_image_set->top->width());
 
     // Overlay our drop-down hot state.
     if (drop_hover_animation_->GetCurrentValue() > 0) {
-      canvas->AsCanvasSkia()->saveLayerAlpha(
-          NULL,
+      canvas->saveLayerAlpha(NULL,
           static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255),
           SkCanvas::kARGB_NoClipLayer_SaveFlag);
-      canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255,
-                                       SkXfermode::kClear_Mode);
+      canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
 
       PaintBitmaps(canvas,
                    drop_down_image_set->top, drop_down_image_set->center,
                    drop_down_image_set->bottom,
                    x, box_y_, box_height_, drop_down_image_set->top->width());
 
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
     }
   }
 
   if (rtl_ui) {
     // Restore the canvas to avoid file name etc. text are drawn flipped.
     // Consequently, the x-axis of following canvas->DrawXXX() method should be
     // mirrored so the text and images are down in the right positions.
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   }
 
   // Print the text, left aligned and always print the file extension.
   // Last value of x was the end of the right image, just before the button.
   // Note that in dangerous mode we use a label (as the text is multi-line).
   if (!IsDangerousMode()) {
     std::wstring filename;
     if (!disabled_while_opening_) {
       filename = gfx::ElideFilename(download_->GetFileName(),
                                     font_, kTextWidth);
@@ skipping 397 matching lines @@
 void DownloadItemView::Reenable() {
   disabled_while_opening_ = false;
   SetEnabled(true);  // Triggers a repaint.
 }
 
 bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
   if (x > drop_down_x_left_ && x < drop_down_x_right_)
     return true;
   return false;
 }