Revert 50784 - Canvas refactoring part 3....

views/controls/button/text_button.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/button/text_button.h"
 
 #include <algorithm>
 
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
 
 namespace views {
 
 // Padding between the icon and text.
 static const int kIconTextPadding = 5;
 
 // Preferred padding between text and edge
@@ skipping 227 matching lines @@
   show_highlighted_ = show_highlighted;
 }
 
 void TextButton::Paint(gfx::Canvas* canvas, bool for_drag) {
   if (!for_drag) {
     PaintBackground(canvas);
 
     if (show_highlighted_ && hover_animation_->is_animating()) {
       // Draw the hover bitmap into an offscreen buffer, then blend it
       // back into the current canvas.
-      canvas->AsCanvasSkia()->saveLayerAlpha(NULL,
+      canvas->saveLayerAlpha(NULL,
           static_cast<int>(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);
       PaintBorder(canvas);
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
     } else if ((show_highlighted_ &&
                 (state_ == BS_HOT || state_ == BS_PUSHED)) ||
                (state_ == BS_NORMAL && normal_has_border_)) {
       PaintBorder(canvas);
     }
 
     PaintFocusBorder(canvas);
   }
 
   SkBitmap icon;
@@ skipping 48 matching lines @@
     // Due to the above, we must perform the flipping manually for RTL UIs.
     gfx::Rect text_bounds(text_x, text_y, text_width, text_size_.height());
     text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
 
     SkColor text_color;
     if (show_highlighted_ && (state() == BS_HOT || state() == BS_PUSHED))
       text_color = color_hover_;
     else
       text_color = color_;
 
-    int draw_string_flags = gfx::CanvasSkia::DefaultCanvasTextAlignment() |
+    int draw_string_flags = gfx::Canvas::DefaultCanvasTextAlignment() |
         PrefixTypeToCanvasType(prefix_type_);
 
     if (for_drag) {
 #if defined(OS_WIN)
       // TODO(erg): Either port DrawStringWithHalo to linux or find an
       // alternative here.
-      canvas->AsCanvasSkia()->DrawStringWithHalo(
-          text_, font_, text_color, color_highlight_, text_bounds.x(),
-          text_bounds.y(), text_bounds.width(), text_bounds.height(),
-          draw_string_flags);
+      canvas->DrawStringWithHalo(text_, font_, text_color, color_highlight_,
+                                 text_bounds.x(),
+                                 text_bounds.y(),
+                                 text_bounds.width(),
+                                 text_bounds.height(),
+                                 draw_string_flags);
 #else
       canvas->DrawStringInt(text_,
                             font_,
                             text_color,
                             text_bounds.x(),
                             text_bounds.y(),
                             text_bounds.width(),
                             text_bounds.height(),
                             draw_string_flags);
 #endif
@@ skipping 18 matching lines @@
     canvas->DrawBitmapInt(icon, icon_bounds.x(), icon_bounds.y());
   }
 }
 
 void TextButton::UpdateColor() {
   color_ = IsEnabled() ? color_enabled_ : color_disabled_;
 }
 
 void TextButton::UpdateTextSize() {
   int width = 0, height = 0;
-  gfx::CanvasSkia::SizeStringInt(
+  gfx::Canvas::SizeStringInt(
       text_, font_, &width, &height,
       gfx::Canvas::NO_ELLIPSIS | PrefixTypeToCanvasType(prefix_type_));
   text_size_.SetSize(width, font_.height());
   max_text_size_.SetSize(std::max(max_text_size_.width(), text_size_.width()),
                          std::max(max_text_size_.height(),
                                   text_size_.height()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButton, View overrides:
@@ skipping 27 matching lines @@
   // changed by other functions like CustomButton::SetState().
   UpdateColor();
   SchedulePaint();
 }
 
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views