Revert 50784 - Canvas refactoring part 3....

views/painter.cc

Index: views/painter.cc
===================================================================
--- views/painter.cc	(revision 50789)
+++ views/painter.cc	(working copy)
@@ -7,7 +7,6 @@
 #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"
@@ -44,9 +43,8 @@
     // 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:
@@ -148,10 +146,10 @@
   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