Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/canvas_android.cc

Issue 22835002: Supports gfx::FontList in gfx::Canvas and ui::ElideText family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates based on review comments. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/base/text/text_elider.cc ('K') | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas_android.cc
diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc
index c26a668f1d466ba805125e9dd06f77faa9f70f16..25e71ea753c2c1a730f93815b9e6d1ccd793b0cf 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -5,13 +5,12 @@
#include "ui/gfx/canvas.h"
#include "base/logging.h"
-#include "ui/gfx/font.h"
namespace gfx {
// static
void Canvas::SizeStringInt(const base::string16& text,
- const gfx::Font& font,
+ const gfx::FontList& font_list,
int* width,
int* height,
int line_height,
@@ -20,7 +19,7 @@ void Canvas::SizeStringInt(const base::string16& text,
}
void Canvas::DrawStringWithShadows(const base::string16& text,
- const gfx::Font& font,
+ const gfx::FontList& font_list,
SkColor color,
const gfx::Rect& text_bounds,
int line_height,
« ui/base/text/text_elider.cc ('K') | « ui/gfx/canvas.cc ('k') | ui/gfx/canvas_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698