Chromium Code Reviews| Index: ui/gfx/render_text_harfbuzz.cc |
| diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc |
| index 5a5bd47b517d391ede69932b1569ffee1ad986e8..5ae9ce98f512752f9dc1e8dbe080e6e1c9da2fb0 100644 |
| --- a/ui/gfx/render_text_harfbuzz.cc |
| +++ b/ui/gfx/render_text_harfbuzz.cc |
| @@ -268,7 +268,9 @@ class HarfBuzzFace { |
| }; |
| // Creates a HarfBuzz font from the given Skia face and text size. |
| -hb_font_t* CreateHarfBuzzFont(SkTypeface* skia_face, int text_size) { |
| +hb_font_t* CreateHarfBuzzFont(SkTypeface* skia_face, |
| + int text_size, |
| + const FontRenderParams& params) { |
| typedef std::pair<HarfBuzzFace, GlyphCache> FaceCache; |
| // TODO(ckocagil): This shouldn't grow indefinitely. Maybe use base::MRUCache? |
| @@ -284,6 +286,8 @@ hb_font_t* CreateHarfBuzzFont(SkTypeface* skia_face, int text_size) { |
| FontData* hb_font_data = new FontData(&face_cache->second); |
| hb_font_data->paint_.setTypeface(skia_face); |
| hb_font_data->paint_.setTextSize(text_size); |
| + // TODO(ckocagil): Do we need to update these params later? |
| + internal::ApplyRenderParams(params, &hb_font_data->paint_); |
| hb_font_set_funcs(harfbuzz_font, g_font_funcs.Get().get(), hb_font_data, |
| DeleteByType<FontData>); |
| hb_font_make_immutable(harfbuzz_font); |
| @@ -1112,8 +1116,15 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run, |
| if (skia_face == NULL) |
| return false; |
| run->skia_face = skia_face; |
| + FontRenderParamsQuery query(false); |
| + query.families.push_back(font_family); |
| + query.pixel_size = run->font_size; |
| + query.style = run->font_style; |
| + FontRenderParams params = GetFontRenderParams(query, NULL); |
| + if (background_is_transparent()) |
| + params.subpixel_rendering = FontRenderParams::SUBPIXEL_RENDERING_NONE; |
|
Daniel Erat
2014/08/15 18:34:25
can you make ApplyRenderParams() check whether the
ckocagil
2014/08/15 19:05:57
ApplyRenderParams doesn't know whether the backgro
msw
2014/08/15 19:21:17
I wonder if the pattern here is correct, given how
ckocagil
2014/08/15 22:28:01
gfx::Font (as it currently is) is kinda heavyweigh
msw
2014/08/16 00:30:11
Acknowledged; if you see a specific reason to add
|
| hb_font_t* harfbuzz_font = CreateHarfBuzzFont(run->skia_face.get(), |
| - run->font_size); |
| + run->font_size, params); |
| // Create a HarfBuzz buffer and add the string to be shaped. The HarfBuzz |
| // buffer holds our text, run information to be used by the shaping engine, |
| @@ -1147,6 +1158,7 @@ bool RenderTextHarfBuzz::ShapeRunWithFont(internal::TextRunHarfBuzz* run, |
| const int y_offset = SkFixedToScalar(hb_positions[i].y_offset); |
| run->positions[i].set(run->width + x_offset, -y_offset); |
| run->width += SkFixedToScalar(hb_positions[i].x_advance); |
| + run->width = std::floor(run->width + 0.5f); |
|
msw
2014/08/15 19:21:17
Whoa, this seems really bad... This rounds the run
ckocagil
2014/08/15 22:28:01
This rounding is needed to place the glyphs at int
msw
2014/08/16 00:30:11
Yuck, please add a comment then. Would we get the
ckocagil
2014/08/16 14:01:14
Subpixel positioning seems to be always disabled o
|
| } |
| hb_buffer_destroy(buffer); |