Revert 50784 - Canvas refactoring part 3....

views/widget/root_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/widget/root_view.h"
 
 #include <algorithm>
 
 #include "app/drag_drop_types.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "views/fill_layout.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_LINUX)
 #include "views/widget/widget_gtk.h"
 #endif  // defined(OS_LINUX)
 
 namespace views {
@@ skipping 142 matching lines @@
 #endif
 
   // Clip the invalid rect to our bounds. If a view is in a scrollview
   // it could be a lot larger
   invalid_rect_ = GetScheduledPaintRectConstrainedToSize();
 
   if (invalid_rect_.IsEmpty())
     return;
 
   // Clear the background.
-  canvas->AsCanvasSkia()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+  canvas->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
 
   // Save the current transforms.
-  canvas->AsCanvasSkia()->save();
+  canvas->save();
 
   // Set the clip rect according to the invalid rect.
   int clip_x = invalid_rect_.x() + x();
   int clip_y = invalid_rect_.y() + y();
   canvas->ClipRectInt(clip_x, clip_y, invalid_rect_.width(),
                       invalid_rect_.height());
 
   // Paint the tree
   View::ProcessPaint(canvas);
 
   // Restore the previous transform
-  canvas->AsCanvasSkia()->restore();
+  canvas->restore();
 
   ClearPaintRect();
 }
 
 void RootView::PaintNow() {
   if (pending_paint_task_) {
     pending_paint_task_->Cancel();
     pending_paint_task_ = NULL;
   }
   if (!paint_task_needed_)
@@ skipping 578 matching lines @@
   MouseEvent exited_near_event(Event::ET_MOUSE_EXITED_NEAR, 0, 0, 0);
   for (std::set<View*>::const_iterator i = near_views_.begin();
        i != near_views_.end(); ++i) {
     (*i)->OnMouseExitedNear(exited_near_event);
   }
 
   near_views_.clear();
 }
 
 }  // namespace views