Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/dragged_tab_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/tabs/dragged_tab_view.h"
 
 #include "chrome/browser/views/tabs/native_view_photobooth.h"
+#include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #elif defined(OS_LINUX)
 #include "views/widget/widget_gtk.h"
 #endif
 
@@ skipping 160 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // DraggedTabView, private:
 
 void DraggedTabView::PaintAttachedTab(gfx::Canvas* canvas) {
   renderer_->ProcessPaint(canvas);
 }
 
 void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
   gfx::Size ps = GetPreferredSize();
-  gfx::CanvasSkia scale_canvas(ps.width(), ps.height(), false);
+  // TODO(beng): Convert to CanvasSkia
+  gfx::Canvas scale_canvas(ps.width(), ps.height(), false);
   SkBitmap& bitmap_device = const_cast<SkBitmap&>(
       scale_canvas.getTopPlatformDevice().accessBitmap(true));
   bitmap_device.eraseARGB(0, 0, 0, 0);
 
   scale_canvas.FillRectInt(kDraggedTabBorderColor, 0,
       attached_tab_size_.height() - kDragFrameBorderSize,
       ps.width(), ps.height() - attached_tab_size_.height());
   int image_x = kDragFrameBorderSize;
   int image_y = attached_tab_size_.height();
   int image_w = ps.width() - kTwiceDragFrameBorderSize;
@@ skipping 21 matching lines @@
   SkPaint paint;
   paint.setShader(bitmap_shader);
   paint.setAntiAlias(true);
   bitmap_shader->unref();
 
   SkRect rc;
   rc.fLeft = 0;
   rc.fTop = 0;
   rc.fRight = SkIntToScalar(ps.width());
   rc.fBottom = SkIntToScalar(ps.height());
-  canvas->AsCanvasSkia()->drawRect(rc, paint);
+  canvas->drawRect(rc, paint);
 }
 
 void DraggedTabView::PaintFocusRect(gfx::Canvas* canvas) {
   gfx::Size ps = GetPreferredSize();
   canvas->DrawFocusRect(0, 0,
                         static_cast<int>(ps.width() * kScalingFactor),
                         static_cast<int>(ps.height() * kScalingFactor));
 }
 
 void DraggedTabView::ResizeContainer() {
   gfx::Size ps = GetPreferredSize();
   int w = ScaleValue(ps.width());
   int h = ScaleValue(ps.height());
 #if defined(OS_WIN)
   SetWindowPos(container_->GetNativeView(), HWND_TOPMOST, 0, 0, w, h,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
 #else
   gfx::Rect bounds;
   container_->GetBounds(&bounds, true);
   container_->SetBounds(gfx::Rect(bounds.x(), bounds.y(), w, h));
 #endif
 }
 
 int DraggedTabView::ScaleValue(int value) {
   return attached_ ? value : static_cast<int>(value * kScalingFactor);
 }