third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp - Issue 56198: Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

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: third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp

Issue 56198: Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 8 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 | « third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.h ('k') | third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp

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

--- third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp (revision 13094)

+++ third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp (working copy)

@@ -88,7 +88,7 @@

// FIXME: The only case where we know we don't match IE is for ANSI encodings.

// IE uses MS Shell Dlg there, which we render incorrectly at certain pixel

// sizes (e.g. 15px). So, for now we just use Arial.

-static const char* defaultGUIFont(Document* document)

+static const char* defaultGUIFont()

{

return "Arial";

}

@@ -155,7 +155,7 @@

return 0.5;

}

-void RenderThemeChromiumLinux::systemFont(int propId, Document* document, FontDescription& fontDescription) const

+void RenderThemeChromiumLinux::systemFont(int propId, FontDescription& fontDescription) const

{

float fontSize = DefaultFontSize;

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

break;

}

- fontDescription.firstFamily().setFamily(defaultGUIFont(NULL));

+ fontDescription.firstFamily().setFamily(defaultGUIFont());

fontDescription.setSpecifiedSize(fontSize);

fontDescription.setIsAbsoluteSize(true);

fontDescription.setGenericFamily(FontDescription::NoFamily);