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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 2031223003: Support underline on Linux again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the gtk2_ui as well. Created 4 years, 6 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 | « chrome/browser/ui/libgtk2ui/gtk2_ui.h ('k') | ui/gfx/font_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index 49e40636a198e40ea328f01e16ec477dbeb93735..769f60b68da0201d0a130b0649954e3e2b63c0d3 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -836,12 +836,12 @@ gfx::FontRenderParams Gtk2UI::GetDefaultFontRenderParams() const {
void Gtk2UI::GetDefaultFontDescription(
std::string* family_out,
int* size_pixels_out,
- bool* italic_out,
+ int* style_out,
gfx::Font::Weight* weight_out,
gfx::FontRenderParams* params_out) const {
*family_out = default_font_family_;
*size_pixels_out = default_font_size_pixels_;
- *italic_out = (default_font_style_ & gfx::Font::ITALIC) != 0;
+ *style_out = default_font_style_;
*weight_out = default_font_weight_;
*params_out = default_font_render_params_;
}
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.h ('k') | ui/gfx/font_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698