Revert 50784 - Canvas refactoring part 3....

views/controls/menu/menu_item_view_gtk.cc

 // Copyright (c) 2009 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_item_view.h"
 
 #include "app/resource_bundle.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 // Background color when the menu item is selected.
@@ skipping 44 matching lines @@
   int bottom_margin = GetBottomMargin();
   int icon_y = top_margin + (height() - config.item_top_margin -
                              bottom_margin - config.check_height) / 2;
   int icon_height = config.check_height;
   int available_height = height() - top_margin - bottom_margin;
 
   // Render the background. As MenuScrollViewContainer draws the background, we
   // only need the background when we want it to look different, as when we're
   // selected.
   if (render_selection)
-    canvas->AsCanvasSkia()->drawColor(kSelectedBackgroundColor,
-                                      SkXfermode::kSrc_Mode);
+    canvas->drawColor(kSelectedBackgroundColor, SkXfermode::kSrc_Mode);
 
   // Render the check.
   if (type_ == CHECKBOX && GetDelegate()->IsItemChecked(GetCommand())) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     SkBitmap* check = rb.GetBitmapNamed(IDR_MENU_CHECK);
     // Don't use config.check_width here as it's padded to force more padding.
     gfx::Rect check_bounds(icon_x, icon_y, check->width(), icon_height);
     AdjustBoundsForRTLUI(&check_bounds);
     canvas->DrawBitmapInt(*check, check_bounds.x(), check_bounds.y());
   } else if (type_ == RADIO) {
@@ skipping 12 matching lines @@
     SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 };
     SkShader* shader = SkGradientShader::CreateLinear(
         gradient_points, gradient_colors, NULL, arraysize(gradient_points),
         SkShader::kClamp_TileMode, NULL);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     paint.setShader(shader);
     shader->unref();
     int radius = kIndicatorSize / 2;
-    canvas->AsCanvasSkia()->drawCircle(radius, radius, radius, paint);
+    canvas->drawCircle(radius, radius, radius, paint);
 
     paint.setStrokeWidth(SkIntToScalar(0));
     paint.setShader(NULL);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(kBaseStroke);
-    canvas->AsCanvasSkia()->drawCircle(radius, radius, radius, paint);
+    canvas->drawCircle(radius, radius, radius, paint);
 
     if (GetDelegate()->IsItemChecked(GetCommand())) {
       SkPoint selected_gradient_points[2];
       selected_gradient_points[0].set(SkIntToScalar(0), SkIntToScalar(0));
       selected_gradient_points[1].set(
           SkIntToScalar(0),
           SkIntToScalar(kSelectedIndicatorSize));
       SkColor selected_gradient_colors[2] = { kRadioButtonIndicatorGradient0,
                                               kRadioButtonIndicatorGradient1 };
       shader = SkGradientShader::CreateLinear(
           selected_gradient_points, selected_gradient_colors, NULL,
           arraysize(selected_gradient_points), SkShader::kClamp_TileMode, NULL);
       paint.setShader(shader);
       shader->unref();
       paint.setStyle(SkPaint::kFill_Style);
-      canvas->AsCanvasSkia()->drawCircle(radius, radius,
-                                         kSelectedIndicatorSize / 2, paint);
+      canvas->drawCircle(radius, radius, kSelectedIndicatorSize / 2, paint);
 
       paint.setStrokeWidth(SkIntToScalar(0));
       paint.setShader(NULL);
       paint.setStyle(SkPaint::kStroke_Style);
       paint.setColor(kIndicatorStroke);
-      canvas->AsCanvasSkia()->drawCircle(radius, radius,
-                                         kSelectedIndicatorSize / 2, paint);
+      canvas->drawCircle(radius, radius, kSelectedIndicatorSize / 2, paint);
     }
 
     canvas->TranslateInt(
         -icon_x,
         -(top_margin + (height() - top_margin - bottom_margin -
                         kIndicatorSize) / 2));
   }
 
   // Render the foreground.
 #if defined(OS_CHROMEOS)
@@ skipping 36 matching lines @@
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     canvas->DrawBitmapInt(*rb.GetBitmapNamed(IDR_MENU_ARROW),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views