Canvas refactoring part 2....

views/controls/tree/tree_view.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/tree/tree_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "gfx/canvas.h"
-#include "gfx/canvas_paint.h"
+#include "gfx/canvas_skia.h"
+#include "gfx/canvas_skia_paint.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 TreeView::TreeView()
@@ skipping 653 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::Canvas canvas(width, height, false);
+        gfx::CanvasSkia canvas(width, height, false);
         // Make the background completely transparent.
         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]);
@@ skipping 30 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::CanvasPaint canvas(window);
+      gfx::CanvasSkiaPaint canvas(window);
       if (canvas.isEmpty())
         return 0;
 
       HDC dc = canvas.beginPlatformPaint();
       if (base::i18n::IsRTL()) {
-        // gfx::Canvas ends up configuring the DC with a mode of GM_ADVANCED.
+        // 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};
@@ skipping 33 matching lines @@
       }
       // 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