Supports gfx::FontList in gfx::Canvas and ui::ElideText family.

ui/gfx/canvas.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/gfx/canvas.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/canvas_skia_paint.h"
 #endif
 
 namespace gfx {
@@ skipping 55 matching lines @@
       gfx::ScaleSize(size, ui::GetScaleFactorScale(scale_factor)));
   owned_canvas_ = skia::AdoptRef(skia::CreatePlatformCanvas(pixel_size.width(),
                                                             pixel_size.height(),
                                                             is_opaque));
   canvas_ = owned_canvas_.get();
   SkScalar scale = SkFloatToScalar(ui::GetScaleFactorScale(scale_factor_));
   canvas_->scale(scale, scale);
 }
 
 // static
+int Canvas::GetStringWidth(const base::string16& text,
+                           const gfx::FontList& font_list) {
+  int width = 0, height = 0;
+  Canvas::SizeStringInt(text, font_list, &width, &height, 0, NO_ELLIPSIS);
+  return width;
+}
+
+// static
 int Canvas::GetStringWidth(const base::string16& text, const gfx::Font& font) {
   int width = 0, height = 0;
   Canvas::SizeStringInt(text, font, &width, &height, 0, NO_ELLIPSIS);
   return width;
 }
 
 // static
 int Canvas::DefaultCanvasTextAlignment() {
   return base::i18n::IsRTL() ? TEXT_ALIGN_RIGHT : TEXT_ALIGN_LEFT;
 }
@@ skipping 302 matching lines @@
   skia::RefPtr<SkShader> shader = gfx::CreateImageRepShader(
       image_rep,
       SkShader::kRepeat_TileMode,
       matrix);
 
   SkPaint p(paint);
   p.setShader(shader.get());
   canvas_->drawPath(path, p);
 }
 
+void Canvas::DrawString(const base::string16& text,
+                        const gfx::FontList& font_list,
+                        SkColor color,
+                        const gfx::Rect& display_rect) {
+  DrawStringWithAligned(text, font_list, color, display_rect,
+                        DefaultCanvasTextAlignment());
+}
+
+void Canvas::DrawStringWithAligned(const base::string16& text,
+                                   const gfx::FontList& font_list,
+                                   SkColor color,
+                                   const gfx::Rect& display_rect,
+                                   int flags) {
+  DrawStringWithShadows(text,
+                        font_list,
+                        color,
+                        display_rect,
+                        0,
+                        flags,
+                        ShadowValues());
+}
+
 void Canvas::DrawStringInt(const base::string16& text,
                            const gfx::Font& font,
                            SkColor color,
                            int x, int y, int w, int h) {
   DrawStringInt(text, font, color, x, y, w, h, DefaultCanvasTextAlignment());
 }
 
 void Canvas::DrawStringInt(const base::string16& text,
                            const gfx::Font& font,
                            SkColor color,
@@ skipping 112 matching lines @@
 
     float bitmap_scale = image_rep.GetScale();
     if (scale_x < bitmap_scale || scale_y < bitmap_scale)
       const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap();
   }
 
   return image_rep;
 }
 
 }  // namespace gfx