Make CanvasPainter raster directly to an SkBitmap

ui/views/controls/label_unittest.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/label.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 34 matching lines @@
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
 class TestLabel : public Label {
  public:
   TestLabel() : Label(ASCIIToUTF16("TestLabel")) { SizeToPreferredSize(); }
 
   int schedule_paint_count() const { return schedule_paint_count_; }
 
   void SimulatePaint() {
-    gfx::Canvas canvas(bounds().size(), 1.0, false /* is_opaque */);
-    Paint(ui::CanvasPainter(&canvas, 1.f).context());
+    SkBitmap bitmap;
+    SkColor color = SK_ColorTRANSPARENT;
+    Paint(ui::CanvasPainter(&bitmap, bounds().size(), 1.f, color).context());
   }
 
   // View:
   void SchedulePaintInRect(const gfx::Rect& r) override {
     ++schedule_paint_count_;
     Label::SchedulePaintInRect(r);
   }
 
  private:
   int schedule_paint_count_ = 0;
@@ skipping 1045 matching lines @@
   label()->SetObscured(false);
 
   // For an empty label, both COPY and SELECT_ALL should be disabled.
   label()->SetText(base::string16());
   ASSERT_TRUE(label()->SetSelectable(true));
   EXPECT_FALSE(IsMenuCommandEnabled(IDS_APP_COPY));
   EXPECT_FALSE(IsMenuCommandEnabled(IDS_APP_SELECT_ALL));
 }
 
 }  // namespace views