| Index: ui/gfx/canvas_skia_skia.cc
|
| diff --git a/ui/gfx/canvas_skia_skia.cc b/ui/gfx/canvas_skia_skia.cc
|
| index b9e033c8e423449401a6f0ba848367d31f3221cd..fdb10c9c36d5241801dbacdec1d25d6f937dbe8c 100644
|
| --- a/ui/gfx/canvas_skia_skia.cc
|
| +++ b/ui/gfx/canvas_skia_skia.cc
|
| @@ -203,7 +203,7 @@ void CanvasSkia::SizeStringInt(const string16& text,
|
| for (size_t i = 0; i < strings.size(); ++i) {
|
| StripAcceleratorChars(flags, &strings[i]);
|
| render_text->SetText(strings[i]);
|
| - w = std::max(w, render_text->GetStringWidth());
|
| + w = std::max(w, render_text->GetStringSize().width());
|
| h += font.GetHeight();
|
| }
|
| *width = w;
|
| @@ -220,7 +220,7 @@ void CanvasSkia::SizeStringInt(const string16& text,
|
| string16 adjusted_text = text;
|
| StripAcceleratorChars(flags, &adjusted_text);
|
| UpdateRenderText(rect, adjusted_text, font, flags, 0, render_text.get());
|
| - *width = render_text->GetStringWidth();
|
| + *width = render_text->GetStringSize().width();
|
| }
|
| *height = font.GetHeight();
|
| }
|
|
|