Canvas refactoring part 2....

views/window/window_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/window/window_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/win_util.h"
-#include "gfx/canvas_paint.h"
+#include "gfx/canvas_skia_paint.h"
 #include "gfx/font.h"
 #include "gfx/icon_util.h"
 #include "gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
 #include "views/window/custom_frame_view.h"
 #include "views/window/native_frame_view.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window_delegate.h"
@@ skipping 904 matching lines @@
     // The root view has a region that needs to be painted. Include it in the
     // region we're going to paint.
 
     CRect old_paint_region_crect = old_paint_region.ToRECT();
     CRect tmp = dirty_region;
     UnionRect(&dirty_region, &tmp, &old_paint_region_crect);
   }
 
   root_view->SchedulePaint(gfx::Rect(dirty_region), false);
 
-  // gfx::CanvasPaints destructor does the actual painting. As such, wrap the
-  // following in a block to force paint to occur so that we can release the dc.
+  // gfx::CanvasSkiaPaint's destructor does the actual painting. As such, wrap
+  // the following in a block to force paint to occur so that we can release
+  // the dc.
   {
-    gfx::CanvasPaint canvas(dc, opaque(), dirty_region.left, dirty_region.top,
-                            dirty_region.Width(), dirty_region.Height());
+    gfx::CanvasSkiaPaint canvas(dc, opaque(), dirty_region.left, dirty_region.top,
+                                dirty_region.Width(), dirty_region.Height());
 
-    root_view->ProcessPaint(&canvas);
+    root_view->ProcessPaint(canvas.AsCanvas());
   }
 
   ReleaseDC(GetNativeView(), dc);
 }
 
 void WindowWin::OnNCLButtonDown(UINT ht_component, const CPoint& point) {
   // When we're using a native frame, window controls work without us
   // interfering.
   if (!non_client_view_->UseNativeFrame()) {
     switch (ht_component) {
@@ skipping 551 matching lines @@
   Window::CloseSecondaryWidget(root_view->GetWidget());
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views