Source/core/rendering/RenderThemeChromiumFontProvider.h - Issue 677103002: Expand system font values during property parsing.

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: Source/core/rendering/RenderThemeChromiumFontProvider.h

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: OVERRIDE -> override, Allow CSSValueNone in systemFont() Created 6 years, 2 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

« Source/core/rendering/RenderTheme.cpp ('K') | « Source/core/rendering/RenderTheme.cpp ('k') | Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderThemeChromiumFontProvider.h

diff --git a/Source/core/rendering/RenderThemeChromiumFontProvider.h b/Source/core/rendering/RenderThemeChromiumFontProvider.h

index d0ec007d6755b4f7a5a8f2c6cb89cfafbdda0121..403f5a9bd20628e69a271c202bdae11034e6a91f 100644

--- a/Source/core/rendering/RenderThemeChromiumFontProvider.h

+++ b/Source/core/rendering/RenderThemeChromiumFontProvider.h

@@ -27,6 +27,7 @@

#define RenderThemeChromiumFontProvider_h

#include "core/CSSValueKeywords.h"

+#include "platform/fonts/FontTraits.h"

namespace blink {

@@ -34,7 +35,7 @@ class FontDescription;

class RenderThemeChromiumFontProvider {

public:

- static void systemFont(CSSValueID, FontDescription&);

+ static void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, float& fontSize, AtomicString& fontFamily);

static void setDefaultFontSize(int);

protected: