Canvas refactoring part 2....

views/controls/table/native_table_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/controls/table/native_table_win.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/table_model.h"
 #include "base/logging.h"
 #include "base/win_util.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // Added to column width to prevent truncation.
@@ skipping 356 matching lines @@
 
   if (table_->model())
     UpdateListViewCache(0, table_->model()->RowCount(), true);
 
   if (table_->type() == ICON_AND_TEXT) {
     HIMAGELIST image_list =
         ImageList_Create(kImageSize, kImageSize, ILC_COLOR32, 2, 2);
     // We create 2 phony images because we are going to switch images at every
     // refresh in order to force a refresh of the icon area (somehow the clip
     // rect does not include the icon).
-    gfx::Canvas canvas(kImageSize, kImageSize, false);
+    gfx::CanvasSkia canvas(kImageSize, kImageSize, false);
     // Make the background completely transparent.
     canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
     HICON empty_icon =
         IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap());
     ImageList_AddIcon(image_list, empty_icon);
     ImageList_AddIcon(image_list, empty_icon);
     DeleteObject(empty_icon);
     ListView_SetImageList(native_view(), image_list, LVSIL_SMALL);
   }
 
@@ skipping 98 matching lines @@
           RECT icon_rect, client_rect;
           if (ListView_GetItemRect(native_view(), view_index, &icon_rect,
                                    LVIR_ICON) &&
               GetClientRect(native_view(), &client_rect)) {
             RECT intersection;
             // Client rect includes the header but we need to make sure we don't
             // paint into it.
             client_rect.top += content_offset_;
             // Make sure the region need to paint is visible.
             if (IntersectRect(&intersection, &icon_rect, &client_rect)) {
-              gfx::Canvas canvas(icon_rect.right - icon_rect.left,
-                                 icon_rect.bottom - icon_rect.top, false);
+              gfx::CanvasSkia canvas(icon_rect.right - icon_rect.left,
+                                     icon_rect.bottom - icon_rect.top, false);
 
               // It seems the state in nmcd.uItemState is not correct.
               // We'll retrieve it explicitly.
               int selected = ListView_GetItemState(
                   native_view(), view_index, LVIS_SELECTED | LVIS_DROPHILITED);
               bool drop_highlight = ((selected & LVIS_DROPHILITED) != 0);
               int bg_color_index;
               if (!IsEnabled())
                 bg_color_index = COLOR_3DFACE;
               else if (drop_highlight)
@@ skipping 377 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWrapper, public:
 
 // static
 NativeTableWrapper* NativeTableWrapper::CreateNativeWrapper(TableView2* table) {
   return new NativeTableWin(table);
 }
 
 }  // namespace views