Source/WebCore/platform/chromium/PlatformBridge.h - Issue 7618010: Merge 92269 - [Chromium] Fix OOP font loading to work on 10.6.6 and above.

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/WebCore/platform/chromium/PlatformBridge.h

Issue 7618010: Merge 92269 - [Chromium] Fix OOP font loading to work on 10.6.6 and above. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 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: Source/WebCore/platform/chromium/PlatformBridge.h

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

--- Source/WebCore/platform/chromium/PlatformBridge.h (revision 92838)

+++ Source/WebCore/platform/chromium/PlatformBridge.h (working copy)

@@ -151,7 +151,7 @@

static bool ensureFontLoaded(HFONT);

#endif

#if OS(DARWIN)

- static bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);

+ static bool loadFont(NSFont* srcFont, ATSFontContainerRef*, uint32_t* fontID);

#elif OS(UNIX)

static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);

static String getFontFamilyForCharacters(const UChar*, size_t numCharacters, const char* preferredLocale);

« no previous file with comments | « no previous file | Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.h » ('j') | no next file with comments »