Revert 50784 - Canvas refactoring part 3....

views/painter.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/painter.h"
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "gfx/canvas.h"
-#include "gfx/canvas_skia.h"
 #include "gfx/insets.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace views {
 
 namespace {
 
 class GradientPainter : public Painter {
  public:
@@ skipping 16 matching lines @@
       p[1].set(SkIntToScalar(0), SkIntToScalar(h));
 
     SkShader* s =
         SkGradientShader::CreateLinear(p, colors_, NULL, 2,
                                        SkShader::kClamp_TileMode, NULL);
     paint.setStyle(SkPaint::kFill_Style);
     paint.setShader(s);
     // Need to unref shader, otherwise never deleted.
     s->unref();
 
-    canvas->AsCanvasSkia()->drawRectCoords(
-        SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(w), SkIntToScalar(h),
-        paint);
+    canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
+                           SkIntToScalar(w), SkIntToScalar(h), paint);
   }
 
  private:
   bool horizontal_;
   SkColor colors_[2];
 
   DISALLOW_COPY_AND_ASSIGN(GradientPainter);
 };
 
 
@@ skipping 81 matching lines @@
 };
 
 }  // namespace
 
 // static
 void Painter::PaintPainterAt(int x, int y, int w, int h,
                              gfx::Canvas* canvas, Painter* painter) {
   DCHECK(canvas && painter);
   if (w < 0 || h < 0)
     return;
-  canvas->AsCanvasSkia()->save();
+  canvas->save();
   canvas->TranslateInt(x, y);
   painter->Paint(w, h, canvas);
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 }
 
 // static
 Painter* Painter::CreateHorizontalGradient(SkColor c1, SkColor c2) {
   return new GradientPainter(true, c1, c2);
 }
 
 // static
 Painter* Painter::CreateVerticalGradient(SkColor c1, SkColor c2) {
   return new GradientPainter(false, c1, c2);
@@ skipping 24 matching lines @@
   canvas->DrawBitmapInt(*images_[LEFT], 0, 0);
   canvas->DrawBitmapInt(*images_[RIGHT], w - images_[RIGHT]->width(), 0);
   canvas->TileImageInt(*images_[CENTER],
                        images_[LEFT]->width(),
                        0,
                        w - images_[LEFT]->width() - images_[RIGHT]->width(),
                        height_);
 }
 
 }  // namespace views