Revert 50784 - Canvas refactoring part 3....

views/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 "views/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
 #include <iostream>
 #endif
 
 #include "app/drag_drop_types.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
@@ skipping 343 matching lines @@
     }
     child->ProcessPaint(canvas);
   }
 }
 
 void View::ProcessPaint(gfx::Canvas* canvas) {
   if (!IsVisible())
     return;
 
   // We're going to modify the canvas, save it's state first.
-  canvas->AsCanvasSkia()->save();
+  canvas->save();
 
   // Paint this View and its children, setting the clip rect to the bounds
   // of this View and translating the origin to the local bounds' top left
   // point.
   //
   // Note that the X (or left) position we pass to ClipRectInt takes into
   // consideration whether or not the view uses a right-to-left layout so that
   // we paint our view in its mirrored position if need be.
   if (canvas->ClipRectInt(MirroredX(), y(), width(), height())) {
     // Non-empty clip, translate the graphics such that 0,0 corresponds to
     // where this view is located (related to its parent).
     canvas->TranslateInt(MirroredX(), y());
 
     // Save the state again, so that any changes don't effect PaintChildren.
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
 
     // If the View we are about to paint requested the canvas to be flipped, we
     // should change the transform appropriately.
     bool flip_canvas = FlipCanvasOnPaintForRTLUI();
     if (flip_canvas) {
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
-      canvas->AsCanvasSkia()->save();
+      canvas->save();
     }
 
     Paint(canvas);
 
     // We must undo the canvas mirroring once the View is done painting so that
     // we don't pass the canvas with the mirrored transform to Views that
     // didn't request the canvas to be flipped.
     if (flip_canvas)
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
 
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
     PaintChildren(canvas);
   }
 
   // Restore the canvas's original transform.
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 }
 
 void View::PaintNow() {
   if (!IsVisible())
     return;
 
   View* view = GetParent();
   if (view)
     view->PaintNow();
 }
@@ skipping 1077 matching lines @@
   possible_drag = false;
   start_pt = gfx::Point();
 }
 
 void View::DragInfo::PossibleDrag(const gfx::Point& p) {
   possible_drag = true;
   start_pt = p;
 }
 
 }  // namespace