Revert 50784 - Canvas refactoring part 3....

views/controls/menu/menu_scroll_view_container.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 "views/controls/menu/menu_scroll_view_container.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 #endif
 
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "views/border.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
 #include "gfx/native_theme_win.h"
@@ skipping 52 matching lines @@
   }
 
   virtual int OnPerformDrop(const DropTargetEvent& event) {
     return DragDropTypes::DRAG_NONE;
   }
 
   virtual void Paint(gfx::Canvas* canvas) {
     const MenuConfig& config = MenuConfig::instance();
 
 #if defined(OS_WIN)
-    HDC dc = canvas->AsCanvasSkia()->beginPlatformPaint();
+    HDC dc = canvas->beginPlatformPaint();
 
     // The background.
     RECT item_bounds = { 0, 0, width(), height() };
     NativeTheme::instance()->PaintMenuItemBackground(
         NativeTheme::MENU, dc, MENU_POPUPITEM, MPI_NORMAL, false,
         &item_bounds);
-    canvas->AsCanvasSkia()->endPlatformPaint();
+    canvas->endPlatformPaint();
 
     SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
 #else
     SkColor arrow_color = SK_ColorBLACK;
 #endif
 
     // Then the arrow.
     int x = width() / 2;
     int y = (height() - config.scroll_arrow_height) / 2;
     int delta_y = 1;
@@ skipping 74 matching lines @@
                  SubmenuView::kSubmenuBorderSize));
 }
 
 void MenuScrollViewContainer::PaintBackground(gfx::Canvas* canvas) {
   if (background()) {
     View::PaintBackground(canvas);
     return;
   }
 
 #if defined(OS_WIN)
-  HDC dc = canvas->AsCanvasSkia()->beginPlatformPaint();
+  HDC dc = canvas->beginPlatformPaint();
   RECT bounds = {0, 0, width(), height()};
   NativeTheme::instance()->PaintMenuBackground(
       NativeTheme::MENU, dc, MENU_POPUPBACKGROUND, 0, &bounds);
-  canvas->AsCanvasSkia()->endPlatformPaint();
+  canvas->endPlatformPaint();
 #elif defined(OS_CHROMEOS)
   static const SkColor kGradientColors[2] = {
       SK_ColorWHITE,
       SkColorSetRGB(0xF0, 0xF0, 0xF0)
   };
 
   static const SkScalar kGradientPoints[2] = {
       SkIntToScalar(0),
       SkIntToScalar(1)
   };
@@ skipping 10 matching lines @@
   SkPaint paint;
   paint.setShader(shader);
   shader->unref();
 
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
   canvas->FillRectInt(0, 0, width(), height(), paint);
 #else
   // This is the same as COLOR_TOOLBAR.
-  canvas->AsCanvasSkia()->drawColor(SkColorSetRGB(210, 225, 246),
-                                    SkXfermode::kSrc_Mode);
+  canvas->drawColor(SkColorSetRGB(210, 225, 246), SkXfermode::kSrc_Mode);
 #endif
 }
 
 void MenuScrollViewContainer::Layout() {
   gfx::Insets insets = GetInsets();
   int x = insets.left();
   int y = insets.top();
   int width = View::width() - insets.width();
   int content_height = height() - insets.height();
   if (!scroll_up_button_->IsVisible()) {
@@ skipping 32 matching lines @@
 }
 
 bool MenuScrollViewContainer::GetAccessibleRole(
     AccessibilityTypes::Role* role) {
   DCHECK(role);
   *role = AccessibilityTypes::ROLE_MENUPOPUP;
   return true;
 }
 
 }  // namespace views