diff options
| author | mukai <mukai@chromium.org> | 2015-02-10 14:26:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 22:27:28 +0000 |
| commit | f32fdd5b32875f7660857037fa7e40a0a825df89 (patch) | |
| tree | 466f27bec69d59864b891b6173578ba8abb72e06 /ui/gfx/render_text_harfbuzz.cc | |
| parent | bb33973007788e995eec61a3d6be85b141905017 (diff) | |
| download | chromium_src-f32fdd5b32875f7660857037fa7e40a0a825df89.zip chromium_src-f32fdd5b32875f7660857037fa7e40a0a825df89.tar.gz chromium_src-f32fdd5b32875f7660857037fa7e40a0a825df89.tar.bz2 | |
Add minimum line height for render text.
R=msw@chromium.org, ckocagil@chromium.org
TEST=gfx_unittests
BUG=125348, 450791
Review URL: https://codereview.chromium.org/903093004
Cr-Commit-Position: refs/heads/master@{#315658}
Diffstat (limited to 'ui/gfx/render_text_harfbuzz.cc')
| -rw-r--r-- | ui/gfx/render_text_harfbuzz.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc index e864ff7..e4469a6 100644 --- a/ui/gfx/render_text_harfbuzz.cc +++ b/ui/gfx/render_text_harfbuzz.cc @@ -922,8 +922,8 @@ void RenderTextHarfBuzz::EnsureLayout() { HarfBuzzLineBreaker line_breaker( display_rect().width(), font_list().GetBaseline(), - font_list().GetHeight(), multiline(), GetLayoutText(), - multiline() ? &GetLineBreaks() : nullptr, runs_); + std::max(font_list().GetHeight(), min_line_height()), multiline(), + GetLayoutText(), multiline() ? &GetLineBreaks() : nullptr, runs_); // TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed. tracked_objects::ScopedTracker tracking_profile3( |