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

Unified Diff: ui/gfx/canvas_skia_skia.cc

Issue 9390022: Simplify handling of BiDi cursor movement (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge breakage Created 8 years, 9 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
« no previous file with comments | « ui/base/range/range.h ('k') | ui/gfx/render_text.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ui/base/range/range.h ('k') | ui/gfx/render_text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698