app/resource_bundle.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

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: app/resource_bundle.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 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

Index: app/resource_bundle.cc

===================================================================

--- app/resource_bundle.cc (revision 55911)

+++ app/resource_bundle.cc (working copy)

@@ -172,7 +172,7 @@

bold_font_.reset(new gfx::Font());

*bold_font_ =

- base_font_->DeriveFont(0, base_font_->style() | gfx::Font::BOLD);

+ base_font_->DeriveFont(0, base_font_->GetStyle() | gfx::Font::BOLD);

small_font_.reset(new gfx::Font());

*small_font_ = base_font_->DeriveFont(-2);

@@ -182,7 +182,7 @@

medium_bold_font_.reset(new gfx::Font());

*medium_bold_font_ =

- base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD);

+ base_font_->DeriveFont(3, base_font_->GetStyle() | gfx::Font::BOLD);

large_font_.reset(new gfx::Font());

*large_font_ = base_font_->DeriveFont(8);

« no previous file with comments | « app/gfx/font_util.cc ('k') | app/resource_bundle_dummy.cc » ('j') | no next file with comments »