Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1155)

Unified Diff: ui/gfx/canvas_skia.cc

Issue 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a lost comment and modify a render text unittest to not test black because of test env font con… Created 4 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/chromeos/ime/candidate_view.cc ('k') | ui/gfx/font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas_skia.cc
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index d0b97f7595779bd9b02083cc600b5546e52af0d1..f666d290712af77c25da1b10496e7e8571c7871f 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -123,9 +123,9 @@ void UpdateRenderText(const Rect& rect,
render_text->SetColor(color);
const int font_style = font_list.GetFontStyle();
- render_text->SetStyle(BOLD, (font_style & Font::BOLD) != 0);
render_text->SetStyle(ITALIC, (font_style & Font::ITALIC) != 0);
render_text->SetStyle(UNDERLINE, (font_style & Font::UNDERLINE) != 0);
+ render_text->SetWeight(font_list.GetFontWeight());
}
} // namespace
« no previous file with comments | « ui/chromeos/ime/candidate_view.cc ('k') | ui/gfx/font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698