Index: ui/gfx/render_text_harfbuzz.cc |
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc |
index 8d332e3c147b737dfa3a311b6058c16fef1d080a..2fcf15711ff551377b09f42c903f9688eac29a5c 100644 |
--- a/ui/gfx/render_text_harfbuzz.cc |
+++ b/ui/gfx/render_text_harfbuzz.cc |
@@ -1011,7 +1011,8 @@ void RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run, |
hb_buffer_set_script(buffer, ICUScriptToHBScript(run->script)); |
hb_buffer_set_direction(buffer, |
run->is_rtl ? HB_DIRECTION_RTL : HB_DIRECTION_LTR); |
- // TODO(ckocagil): Should we call |hb_buffer_set_language()| here? |
+ // TODO(ckocagil): Should we determine the actual language? |
+ hb_buffer_set_language(buffer, hb_language_get_default()); |
behdad_google
2014/07/20 01:52:51
FWIW setting the language to default is not needed
|
// Shape the text. |
hb_shape(harfbuzz_font, buffer, NULL, 0); |
@@ -1033,7 +1034,7 @@ void RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run, |
SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_offset)); |
const int y_offset = |
SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].y_offset)); |
- run->positions[i].set(run->width + x_offset, y_offset); |
+ run->positions[i].set(run->width + x_offset, -y_offset); |
run->width += |
SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_advance)); |
} |