Add RenderText::SetFont() function to simplify some call sites.

BUG=none
TEST=existing unit tests

Review URL: https://chromiumcodereview.appspot.com/10933129

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157365 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 4 deletions

diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 29f6f77..7019a4a 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -131,7 +131,7 @@ void UpdateRenderText(const gfx::Rect& rect,
                       int flags,
                       SkColor color,
                       gfx::RenderText* render_text) {
-  render_text->SetFontList(gfx::FontList(font));
+  render_text->SetFont(font);
   render_text->SetText(text);
   render_text->SetCursorEnabled(false);
 
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index dc2e0da..4971dca 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -416,6 +416,10 @@ void RenderText::SetFontList(const FontList& font_list) {
   ResetLayout();
 }
 
+void RenderText::SetFont(const Font& font) {
+  SetFontList(FontList(font));
+}
+
 void RenderText::SetFontSize(int size) {
   font_list_ = font_list_.DeriveFontListWithSize(size);
   cached_bounds_and_offset_valid_ = false;
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index d930522..184cf56 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -113,6 +113,7 @@ class UI_EXPORT RenderText {
 
   const FontList& font_list() const { return font_list_; }
   void SetFontList(const FontList& font_list);
+  void SetFont(const Font& font);
 
   // Set the font size to |size| in pixels.
   void SetFontSize(int size);
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 8ac129c..2680800 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1002,7 +1002,7 @@ TEST_F(RenderTextTest, StringSizeSanity) {
 TEST_F(RenderTextTest, StringSizeEmptyString) {
   const Font font;
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-  render_text->SetFontList(FontList(font));
+  render_text->SetFont(font);
 
   render_text->SetText(string16());
   EXPECT_EQ(font.GetHeight(), render_text->GetStringSize().height());
@@ -1013,6 +1013,13 @@ TEST_F(RenderTextTest, StringSizeEmptyString) {
 }
 #endif  // !defined(OS_MACOSX)
 
+TEST_F(RenderTextTest, SetFont) {
+  scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
+  render_text->SetFont(Font("Arial", 12));
+  EXPECT_EQ("Arial", render_text->GetFont().GetFontName());
+  EXPECT_EQ(12, render_text->GetFont().GetFontSize());
+}
+
 TEST_F(RenderTextTest, StringSizeBoldWidth) {
   scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
   render_text->SetText(UTF8ToUTF16("Hello World"));
@@ -1056,14 +1063,14 @@ TEST_F(RenderTextTest, StringSizeHeight) {
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
-    render_text->SetFontList(FontList(default_font));
+    render_text->SetFont(default_font);
     render_text->SetText(cases[i].text);
 
     const int height1 = render_text->GetStringSize().height();
     EXPECT_GT(height1, 0);
 
     // Check that setting the larger font increases the height.
-    render_text->SetFontList(FontList(larger_font));
+    render_text->SetFont(larger_font);
     const int height2 = render_text->GetStringSize().height();
     EXPECT_GT(height2, height1);
   }