ui: Introduce CanvasPainter, remove PaintContext(gfx::Canvas*).

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 "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/compositor/paint_context.h"
+#include "ui/compositor/canvas_painter.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/test/focus_manager_test.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
 
@@ skipping 275 matching lines @@
   EXPECT_EQ(label.text(), state.name);
   EXPECT_TRUE(state.HasStateFlag(ui::AX_STATE_READ_ONLY));
 }
 
 TEST_F(LabelTest, TextChangeWithoutLayout) {
   Label label;
   label.SetText(ASCIIToUTF16("Example"));
   label.SetBounds(0, 0, 200, 200);
 
   gfx::Canvas canvas(gfx::Size(200, 200), 1.0f, true);
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(1u, label.lines_.size());
   EXPECT_EQ(ASCIIToUTF16("Example"), label.lines_[0]->GetDisplayText());
 
   label.SetText(ASCIIToUTF16("Altered"));
   // The altered text should be painted even though Layout() or SetBounds() are
   // not called.
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(1u, label.lines_.size());
   EXPECT_EQ(ASCIIToUTF16("Altered"), label.lines_[0]->GetDisplayText());
 }
 
 TEST_F(LabelTest, EmptyLabelSizing) {
   Label label;
   const gfx::Size expected_size(0, gfx::FontList().GetHeight());
   EXPECT_EQ(expected_size, label.GetPreferredSize());
   label.SetMultiLine(!label.multi_line());
   EXPECT_EQ(expected_size, label.GetPreferredSize());
@@ skipping 149 matching lines @@
   gfx::Size narrow_size = label.GetPreferredSize();
   EXPECT_GT(required_size.width(), narrow_size.width());
   EXPECT_LT(required_size.height(), narrow_size.height());
 
   // SetBounds() doesn't change the preferred size.
   label.SetBounds(0, 0, narrow_size.width() - 1, narrow_size.height());
   EXPECT_EQ(narrow_size.ToString(), label.GetPreferredSize().ToString());
 
   // Paint() doesn't change the preferred size.
   gfx::Canvas canvas;
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(narrow_size.ToString(), label.GetPreferredSize().ToString());
 }
 
 // Check that labels support GetTooltipHandlerForPoint.
 TEST_F(LabelTest, GetTooltipHandlerForPoint) {
   // A root view must be defined for this test because the hit-testing
   // behaviour used by GetTooltipHandlerForPoint() is defined by
   // the ViewTargeter installed on the root view.
   Widget widget;
   Widget::InitParams init_params =
@@ skipping 52 matching lines @@
 TEST_F(LabelTest, ResetRenderTextData) {
   Label label;
   label.SetText(ASCIIToUTF16("Example"));
   label.SizeToPreferredSize();
   gfx::Size preferred_size = label.GetPreferredSize();
 
   EXPECT_NE(gfx::Size().ToString(), preferred_size.ToString());
   EXPECT_EQ(0u, label.lines_.size());
 
   gfx::Canvas canvas(preferred_size, 1.0f, true);
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(1u, label.lines_.size());
 
   // Label should recreate its RenderText object when it's invisible, to release
   // the layout structures and data.
   label.SetVisible(false);
   EXPECT_EQ(0u, label.lines_.size());
 
   // Querying fields or size information should not recompute the layout
   // unnecessarily.
   EXPECT_EQ(ASCIIToUTF16("Example"), label.text());
   EXPECT_EQ(0u, label.lines_.size());
 
   EXPECT_EQ(preferred_size.ToString(), label.GetPreferredSize().ToString());
   EXPECT_EQ(0u, label.lines_.size());
 
   // RenderText data should be back when it's necessary.
   label.SetVisible(true);
   EXPECT_EQ(0u, label.lines_.size());
 
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(1u, label.lines_.size());
 
   // Changing layout just resets |lines_|. It'll recover next time it's drawn.
   label.SetBounds(0, 0, 10, 10);
   EXPECT_EQ(0u, label.lines_.size());
 
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
   EXPECT_EQ(1u, label.lines_.size());
 }
 
 #if !defined(OS_MACOSX)
 TEST_F(LabelTest, MultilineSupportedRenderText) {
   scoped_ptr<gfx::RenderText> render_text(gfx::RenderText::CreateInstance());
   ASSERT_TRUE(render_text->MultilineSupported());
 
   Label label;
   label.SetText(ASCIIToUTF16("Example of\nmultilined label"));
   label.SetMultiLine(true);
   label.SizeToPreferredSize();
 
   gfx::Canvas canvas(label.GetPreferredSize(), 1.0f, true);
-  label.Paint(ui::PaintContext(&canvas));
+  label.Paint(ui::CanvasPainter(&canvas, 1.f).context());
 
   // There's only one 'line', RenderText itself supports multiple lines.
   EXPECT_EQ(1u, label.lines_.size());
 }
 #endif
 
 TEST_F(LabelFocusTest, FocusBounds) {
   label()->SetText(ASCIIToUTF16("Example"));
   gfx::Size normal_size = label()->GetPreferredSize();
 
@@ skipping 37 matching lines @@
   label()->SetFocusable(true);
   label()->RequestFocus();
   label()->SizeToPreferredSize();
 
   gfx::Rect focus_bounds = label()->GetFocusBounds();
   EXPECT_FALSE(focus_bounds.IsEmpty());
   EXPECT_LT(label()->font_list().GetHeight(), focus_bounds.height());
 }
 
 }  // namespace views