Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

ui/views/controls/table/table_view_win.cc

 // Copyright (c) 2012 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 "ui/views/controls/table/table_view_win.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
@@ skipping 791 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::Canvas canvas(gfx::Size(kImageSize, kImageSize), ui::SCALE_FACTOR_100P,
-        false);
+    gfx::Canvas canvas(gfx::Size(kImageSize, kImageSize), false);
     {
-      base::win::ScopedHICON empty_icon(IconUtil::CreateHICONFromSkBitmap(
-          canvas.ExtractImageRep().sk_bitmap()));
+      base::win::ScopedHICON empty_icon(
+          IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap()));
       ImageList_AddIcon(image_list, empty_icon);
       ImageList_AddIcon(image_list, 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
     // the header. We also need to intercept the HDM_LAYOUT to size the header
     // for the Chrome headers.
@@ skipping 321 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::Canvas canvas(bounds.size(), ui::SCALE_FACTOR_100P, false);
+  gfx::Canvas canvas(bounds.size(), false);
   // Pad by 1 for halo.
   canvas.DrawStringWithHalo(alt_text_, font, SK_ColorDKGRAY, SK_ColorWHITE, 1,
                             1, bounds.width() - 2, bounds.height() - 2,
                             gfx::Canvas::DefaultCanvasTextAlignment());
   skia::DrawToNativeContext(
       canvas.sk_canvas(), dc, bounds.x(), bounds.y(), NULL);
   ReleaseDC(GetNativeControlHWND(), dc);
 }
 
 LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
@@ skipping 65 matching lines @@
                                    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::Canvas canvas(gfx::Size(icon_rect.right - icon_rect.left,
                                            icon_rect.bottom - icon_rect.top),
-                                 ui::SCALE_FACTOR_100P,
                                  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 (!enabled())
                 bg_color_index = COLOR_3DFACE;
@@ skipping 386 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->ViewToModel(view_index_);
 }
 
 }  // namespace views