ui/gfx/font.h - Issue 11535014: Replace StyleRange with BreakList; update RenderText, etc.

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/font.h

Issue 11535014: Replace StyleRange with BreakList; update RenderText, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix RenderTextMac style iteration. Created 7 years, 11 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/font.h

diff --git a/ui/gfx/font.h b/ui/gfx/font.h

index aa2b1c7c0a87f632250261ed22a17add6ede2b2c..c05e76c5c16e47068cd980e9c1402052f569df07 100644

--- a/ui/gfx/font.h

+++ b/ui/gfx/font.h

@@ -25,7 +25,7 @@ class UI_EXPORT Font {

NORMAL = 0,

BOLD = 1,

ITALIC = 2,

- UNDERLINED = 4,

+ UNDERLINE = 4,

};

// Creates a font with the default name and style.

@@ -56,7 +56,7 @@ class UI_EXPORT Font {

// |size_delta| is the size in pixels to add to the current font. See the

// single argument version of this method for an example.

// The style parameter specifies the new style for the font, and is a

- // bitmask of the values: BOLD, ITALIC and UNDERLINED.

+ // bitmask of the values: BOLD, ITALIC and UNDERLINE.

Font DeriveFont(int size_delta, int style) const;

// Returns the number of vertical pixels needed to display characters from