Revert 50784 - Canvas refactoring part 3....

views/widget/widget_win.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/widget_win.h"
 
 #include "app/l10n_util_win.h"
 #include "app/system_monitor.h"
 #include "app/win_util.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
 #include "views/focus/focus_util_win.h"
 #include "views/views_delegate.h"
 #include "views/widget/aero_tooltip_manager.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_win.h"
@@ skipping 1092 matching lines @@
     WidgetWin* widget =
         reinterpret_cast<WidgetWin*>(win_util::GetWindowUserData(parent));
     if (widget && widget->is_window_)
       return static_cast<WindowWin*>(widget);
     parent = ::GetParent(parent);
   }
   return NULL;
 }
 
 void WidgetWin::SizeContents(const gfx::Size& window_size) {
-  contents_.reset(new gfx::CanvasSkia(window_size.width(),
-                                      window_size.height(),
-                                      false));
+  contents_.reset(new gfx::Canvas(window_size.width(),
+                                  window_size.height(),
+                                  false));
 }
 
 void WidgetWin::PaintLayeredWindow() {
   // Painting monkeys with our cliprect, so we need to save it so that the
   // call to UpdateLayeredWindow updates the entire window, not just the
   // cliprect.
   contents_->save(SkCanvas::kClip_SaveFlag);
   gfx::Rect dirty_rect = root_view_->GetScheduledPaintRect();
   contents_->ClipRectInt(dirty_rect.x(), dirty_rect.y(), dirty_rect.width(),
                          dirty_rect.height());
@@ skipping 229 matching lines @@
 Widget* Widget::GetWidgetFromNativeWindow(gfx::NativeWindow native_window) {
   return Widget::GetWidgetFromNativeView(native_window);
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace views