Allow CanvasSkia to bind to an existing SkCanvas.

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"
@@ skipping 681 matching lines @@
     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);
         // Make the background completely transparent.
-        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+        canvas.sk_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 32 matching lines @@
   // flickering during resize.
   switch (message) {
     case WM_ERASEBKGND:
       return 1;
 
     case WM_PAINT: {
       gfx::CanvasSkiaPaint canvas(window);
       if (canvas.isEmpty())
         return 0;
 
-      HDC dc = skia::BeginPlatformPaint(&canvas);
+      HDC dc = skia::BeginPlatformPaint(canvas.sk_canvas());
       if (base::i18n::IsRTL()) {
         // 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
@@ skipping 13 matching lines @@
         // copying the upper-left corner to the redraw region.
         SetViewportOrgEx(dc, -canvas.paintStruct().rcPaint.left,
                          -canvas.paintStruct().rcPaint.top, NULL);
       }
       SendMessage(window, WM_PRINTCLIENT, reinterpret_cast<WPARAM>(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);
       }
-      skia::EndPlatformPaint(&canvas);
+      skia::EndPlatformPaint(canvas.sk_canvas());
       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