ui/gfx/render_text.cc - Issue 18848002: Shows Japanese and English mixed queries correctly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/render_text.cc

Issue 18848002: Shows Japanese and English mixed queries correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Disables the test on Android. Created 7 years, 5 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:

Index: ui/gfx/render_text.cc

diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc

index d3c6bea6ffe682b03d68e8e071f991769e5edaa8..5c822e878e469b988a252da3dbc64099640973c3 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) {

« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/render_text_linux.cc » ('j') | no next file with comments »