Source/core/platform/graphics/mac/FontCacheMac.mm - Issue 14325012: Remove the dynamic initialization of WebKitSystemInterface. Just call into the library directly.

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/platform/graphics/mac/FontCacheMac.mm

Issue 14325012: Remove the dynamic initialization of WebKitSystemInterface. Just call into the library directly. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: '' Created 7 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 | « Source/core/platform/graphics/mac/ComplexTextControllerCoreText.mm ('k') | Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/graphics/mac/FontCacheMac.mm

diff --git a/Source/core/platform/graphics/mac/FontCacheMac.mm b/Source/core/platform/graphics/mac/FontCacheMac.mm

index 49190595e34d66baec0e84d99303a14d7175d6c2..d55ff34e73953a99caf014ca675940e745ce73c6 100644

--- a/Source/core/platform/graphics/mac/FontCacheMac.mm

+++ b/Source/core/platform/graphics/mac/FontCacheMac.mm

@@ -61,7 +61,7 @@ static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCe

void FontCache::platformInit()

{

- wkSetUpFontCache();

+ WKSetUpFontCache();

CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), this, fontCacheRegisteredFontsChangedNotificationCallback, kCTFontManagerRegisteredFontsChangedNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);

}

@@ -94,11 +94,11 @@ PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacters(const Font& font,

NSFont *nsFont = platformData.font();

NSString *string = [[NSString alloc] initWithCharactersNoCopy:const_cast<UChar*>(characters) length:length freeWhenDone:NO];

- NSFont *substituteFont = wkGetFontInLanguageForRange(nsFont, string, NSMakeRange(0, length));

+ NSFont *substituteFont = WKGetFontInLanguageForRange(nsFont, string, NSMakeRange(0, length));

[string release];

if (!substituteFont && length == 1)

- substituteFont = wkGetFontInLanguageForCharacter(nsFont, characters[0]);

+ substituteFont = WKGetFontInLanguageForCharacter(nsFont, characters[0]);

if (!substituteFont)

return 0;