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

views/controls/tree/tree_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/tree/tree_view.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/win/win_util.h"
 #include "grit/app_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/point.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 using ui::TreeModel;
 using ui::TreeModelNode;
 
 namespace views {
@@ skipping 661 matching lines @@
     ImageList_AddIcon(image_list, h_opened_icon);
     DestroyIcon(h_closed_icon);
     DestroyIcon(h_opened_icon);
     for (size_t i = 0; i < model_images.size(); ++i) {
       HICON model_icon;
 
       // Need to resize the provided icons to be the same size as
       // IDR_FOLDER_CLOSED if they aren't already.
       if (model_images[i].width() != width ||
           model_images[i].height() != height) {
-        gfx::CanvasSkia canvas(width, height, false);
+        gfx::CanvasSkia canvas;
+        canvas.Init(width, height, false);
         // Make the background completely transparent.
-        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+        canvas.skia_canvas()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
 
         // Draw our icons into this canvas.
         int height_offset = (height - model_images[i].height()) / 2;
         int width_offset = (width - model_images[i].width()) / 2;
         canvas.DrawBitmapInt(model_images[i], width_offset, height_offset);
         model_icon = IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap());
       } else {
         model_icon = IconUtil::CreateHICONFromSkBitmap(model_images[i]);
       }
       ImageList_AddIcon(image_list, model_icon);
@@ skipping 28 matching lines @@
 
   // We handle the messages WM_ERASEBKGND and WM_PAINT such that we paint into
   // a DIB first and then perform a BitBlt from the DIB into the underlying
   // window's DC. This double buffering code prevents the tree view from
   // flickering during resize.
   switch (message) {
     case WM_ERASEBKGND:
       return 1;
 
     case WM_PAINT: {
-      gfx::CanvasSkiaPaint canvas(window);
-      if (canvas.isEmpty())
+      PAINTSTRUCT ps = {0};
+      HDC window_dc = BeginPaint(window, &ps);
+
+      int width = ps.rcPaint.right - ps.rcPaint.left;
+      int height = ps.rcPaint.bottom - ps.rcPaint.top;
+      if ((width == 0) || (height == 0))
         return 0;
 
-      HDC dc = canvas.beginPlatformPaint();
+      // Create a bitmap to draw on.
+      HDC bitmap_dc = CreateCompatibleDC(window_dc);
+      HBITMAP bitmap = CreateCompatibleBitmap(window_dc, width, height);
+      HGDIOBJ default_obj = SelectObject(bitmap_dc, bitmap);
       if (base::i18n::IsRTL()) {
+        // TODO(alokp): May not need this hack anymore since we are creating
+        // a compatible bitmap device context.
+
         // gfx::CanvasSkia ends up configuring the DC with a mode of
         // GM_ADVANCED. For some reason a graphics mode of ADVANCED triggers
         // all the text to be mirrored when RTL. Set the mode back to COMPATIBLE
         // and explicitly set the layout. Additionally SetWorldTransform and
         // COMPATIBLE don't play nicely together. We need to use
         // SetViewportOrgEx when using a mode of COMPATIBLE.
         //
         // Reset the transform to the identify transform. Even though
         // SetWorldTransform and COMPATIBLE don't play nicely, bits of the
         // transform still carry over when we set the mode.
         XFORM xform = {0};
         xform.eM11 = xform.eM22 = 1;
-        SetWorldTransform(dc, &xform);
+        SetWorldTransform(bitmap_dc, &xform);
 
         // Set the mode and layout.
-        SetGraphicsMode(dc, GM_COMPATIBLE);
-        SetLayout(dc, LAYOUT_RTL);
+        SetGraphicsMode(bitmap_dc, GM_COMPATIBLE);
+        SetLayout(bitmap_dc, LAYOUT_RTL);
 
         // Transform the viewport such that the origin of the dc is that of
         // the dirty region. This way when we invoke WM_PRINTCLIENT tree-view
         // draws the dirty region at the origin of the DC so that when we
         // copy the bits everything lines up nicely. Without this we end up
         // copying the upper-left corner to the redraw region.
-        SetViewportOrgEx(dc, -canvas.paintStruct().rcPaint.left,
-                         -canvas.paintStruct().rcPaint.top, NULL);
+        SetViewportOrgEx(bitmap_dc, -ps.rcPaint.left, -ps.rcPaint.top, NULL);
       }
-      SendMessage(window, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(dc), 0);
+
+      SendMessage(window, WM_PRINTCLIENT,
+          reinterpret_cast<WPARAM>(bitmap_dc), 0);
+
       if (base::i18n::IsRTL()) {
         // Reset the origin of the dc back to 0. This way when we copy the bits
         // over we copy the right bits.
-        SetViewportOrgEx(dc, 0, 0, NULL);
+        SetViewportOrgEx(bitmap_dc, 0, 0, NULL);
       }
-      canvas.endPlatformPaint();
+
+      // Copy the bitmap to window.
+      BitBlt(window_dc, ps.rcPaint.left, ps.rcPaint.top, width, height,
+          bitmap_dc, 0, 0, SRCCOPY);
+
+      // Cleanup.
+      SelectObject(bitmap_dc, default_obj);
+      DeleteDC(bitmap_dc);
+      DeleteObject(bitmap);
+      EndPaint(window, &ps);
       return 0;
     }
 
     case WM_RBUTTONDOWN:
       if (tree->select_on_right_mouse_down_) {
         TVHITTESTINFO hit_info;
         hit_info.pt = gfx::Point(l_param).ToPOINT();
         HTREEITEM hit_item = TreeView_HitTest(window, &hit_info);
         if (hit_item && (hit_info.flags & (TVHT_ONITEM | TVHT_ONITEMRIGHT |
                                            TVHT_ONITEMINDENT)) != 0)
           TreeView_SelectItem(tree->tree_view_, hit_item);
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views