diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 15:42:44 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 15:42:44 +0000 |
| commit | 8e072e1dd48266fcc2fd4a5f7d5586919d4aca5d (patch) | |
| tree | 303b69c53426c5d3eebf7c1a0b9dc4a14f1379e4 /ui/gfx/render_text.cc | |
| parent | 358eb365ba278bcb8cfc6d6dbbdfe35f8f8b9a8f (diff) | |
| download | chromium_src-8e072e1dd48266fcc2fd4a5f7d5586919d4aca5d.zip chromium_src-8e072e1dd48266fcc2fd4a5f7d5586919d4aca5d.tar.gz chromium_src-8e072e1dd48266fcc2fd4a5f7d5586919d4aca5d.tar.bz2 | |
Fixes vertical alignment of RenderText.
(was: Issue 18848002: Shows Japanese and English mixed queries correctly.)
The CL 18848002 was reverted because the new unit test, which I added, depended on the specific fonts and didn't run well on some of platforms.
I've carefully chosen another font for the unit test, which is available on all platforms.
BUG=244323
TEST=Test manually.
Review URL: https://chromiumcodereview.appspot.com/19352002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text.cc')
| -rw-r--r-- | ui/gfx/render_text.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 1f760cc..91f9f42 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -357,9 +357,7 @@ void RenderText::SetFont(const Font& font) { } void RenderText::SetFontSize(int size) { - font_list_ = font_list_.DeriveFontListWithSize(size); - cached_bounds_and_offset_valid_ = false; - ResetLayout(); + SetFontList(font_list_.DeriveFontListWithSize(size)); } void RenderText::SetCursorEnabled(bool cursor_enabled) { |