Source/WebCore/platform/graphics/win/FontCacheWin.cpp - Issue 13724012: Remove Cairo support.

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/graphics/win/FontCacheWin.cpp

Issue 13724012: Remove Cairo support. (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:

Index: Source/WebCore/platform/graphics/win/FontCacheWin.cpp

diff --git a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

index ee55e1d23c61d0823a071b852ad3e68f9cba83c9..d0f291dc5c4acde4d3f4bb6cd28230780b90f1f6 100644

--- a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

+++ b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

@@ -469,7 +469,7 @@ static HFONT createGDIFont(const AtomicString& family, LONG desiredWeight, bool

matchData.m_chosen.lfUnderline = false;

matchData.m_chosen.lfStrikeOut = false;

matchData.m_chosen.lfCharSet = DEFAULT_CHARSET;

-#if USE(CG) || USE(CAIRO)

+#if USE(CG)

matchData.m_chosen.lfOutPrecision = OUT_TT_ONLY_PRECIS;

#else

matchData.m_chosen.lfOutPrecision = OUT_TT_PRECIS;

@@ -578,8 +578,6 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD

#if USE(CG)

bool fontCreationFailed = !result->cgFont();

-#elif USE(CAIRO)

- bool fontCreationFailed = !result->scaledFont();

#endif

if (fontCreationFailed) {