skia::PlatformCanvas is being deprecated. Going forward we will use gfx::Canvas wherever we need ...

views/controls/table/table_view.cc

 // Copyright (c) 2011 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/table_view.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
@@ skipping 789 matching lines @@
   // Set the # of rows.
   if (model_)
     UpdateListViewCache(0, 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::CanvasSkia canvas(kImageSize, kImageSize, false);
+    gfx::CanvasSkia canvas;
+    canvas.Init(kImageSize, kImageSize, false);
     // Make the background completely transparent.
-    canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+    canvas.skia_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(list_view_, image_list, LVSIL_SMALL);
   }
 
   if (!resizable_columns_) {
     // To disable the resizing of columns we'll filter the events happening on
@@ skipping 323 matching lines @@
       list_view_, static_cast<int>(i - visible_columns_.begin()));
 }
 
 void TableView::PaintAltText() {
   if (alt_text_.empty())
     return;
 
   HDC dc = GetDC(GetNativeControlHWND());
   gfx::Font font = GetAltTextFont();
   gfx::Rect bounds = GetAltTextBounds();
-  gfx::CanvasSkia canvas(bounds.width(), bounds.height(), false);
+  gfx::CanvasSkia canvas;
+  canvas.Init(bounds.width(), bounds.height(), false);
   // Pad by 1 for halo.
   canvas.DrawStringWithHalo(alt_text_, font, SK_ColorDKGRAY, SK_ColorWHITE, 1,
                             1, bounds.width() - 2, bounds.height() - 2,
                             gfx::CanvasSkia::DefaultCanvasTextAlignment());
-  canvas.getTopPlatformDevice().drawToHDC(dc, bounds.x(), bounds.y(), NULL);
+  canvas.BlitToNativeContext(gfx::Rect(bounds.size()), bounds.origin(), dc);
   ReleaseDC(GetNativeControlHWND(), dc);
 }
 
 LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
   switch (draw_info->nmcd.dwDrawStage) {
     case CDDS_PREPAINT: {
       return CDRF_NOTIFYITEMDRAW;
     }
     case CDDS_ITEMPREPAINT: {
       // The list-view is about to paint an item, tell it we want to
@@ skipping 57 matching lines @@
           RECT icon_rect, client_rect;
           if (ListView_GetItemRect(list_view_, view_index, &icon_rect,
                                    LVIR_ICON) &&
               GetClientRect(list_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::CanvasSkia canvas(icon_rect.right - icon_rect.left,
-                                     icon_rect.bottom - icon_rect.top, false);
+              gfx::CanvasSkia canvas;
+              canvas.Init(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(
                   list_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)
                 bg_color_index = COLOR_HIGHLIGHT;
               else if (selected)
                 bg_color_index = HasFocus() ? COLOR_HIGHLIGHT : COLOR_3DFACE;
               else
                 bg_color_index = COLOR_WINDOW;
               // NOTE: This may be invoked without the ListView filling in the
               // background (or rather windows paints background, then invokes
               // this twice). As such, we always fill in the background.
-              canvas.drawColor(
+              canvas.skia_canvas()->drawColor(
                   skia::COLORREFToSkColor(GetSysColor(bg_color_index)),
                   SkXfermode::kSrc_Mode);
               // + 1 for padding (we declared the image as 18x18 in the list-
               // view when they are 16x16 so we get an extra pixel of padding).
               canvas.DrawBitmapInt(image, 0, 0,
                                    image.width(), image.height(),
                                    1, 1, kFaviconSize, kFaviconSize, true);
 
               // Only paint the visible region of the icon.
               RECT to_draw = { intersection.left - icon_rect.left,
                                intersection.top - icon_rect.top,
                                0, 0 };
               to_draw.right = to_draw.left +
                               (intersection.right - intersection.left);
               to_draw.bottom = to_draw.top +
                               (intersection.bottom - intersection.top);
-              canvas.getTopPlatformDevice().drawToHDC(draw_info->nmcd.hdc,
-                                                      intersection.left,
-                                                      intersection.top,
-                                                      &to_draw);
+              canvas.BlitToNativeContext(
+                  gfx::Rect(to_draw),
+                  gfx::Point(intersection.left, intersection.top),
+                  draw_info->nmcd.hdc);
               r = CDRF_SKIPDEFAULT;
             }
           }
         }
       }
       if (ImplementPostPaint()) {
         RECT cell_rect;
         if (ListView_GetItemRect(list_view_, view_index, &cell_rect,
                                  LVIR_BOUNDS)) {
           PostPaint(model_index, 0, false, gfx::Rect(cell_rect),
@@ skipping 346 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->ViewToModel(view_index_);
 }
 
 }  // namespace views