From 48dbff3ce45ef797f7b0c0839c994e25c8e8f285 Mon Sep 17 00:00:00 2001 From: "dglazkov@chromium.org" Date: Thu, 5 Feb 2009 04:18:29 +0000 Subject: [PATCH] 2009-02-04 Dimitri Glazkov Not reviewed, build fix. Remove duplicate definition of msSans in FontCache::alternateFamilyName. * platform/graphics/FontCache.cpp: (WebCore::alternateFamilyName): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40662 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 9 +++++++++ WebCore/platform/graphics/FontCache.cpp | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index a78d832a5906..f32574fc518f 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2009-02-04 Dimitri Glazkov + + Not reviewed, build fix. + + Remove duplicate definition of msSans in FontCache::alternateFamilyName. + + * platform/graphics/FontCache.cpp: + (WebCore::alternateFamilyName): + 2009-02-04 Eric Seidel Reviewed by George Staikos. diff --git a/WebCore/platform/graphics/FontCache.cpp b/WebCore/platform/graphics/FontCache.cpp index c3934913027d..41b740a4fb18 100644 --- a/WebCore/platform/graphics/FontCache.cpp +++ b/WebCore/platform/graphics/FontCache.cpp @@ -166,7 +166,6 @@ static const AtomicString& alternateFamilyName(const AtomicString& familyName) #if PLATFORM(WIN_OS) // On Windows, bitmap fonts are blocked altogether so that we have to // alias MS Sans Serif (bitmap font) -> Microsoft Sans Serif (truetype font) - static AtomicString msSans("MS Sans Serif"); DEFINE_STATIC_LOCAL(AtomicString, msSans, ("MS Sans Serif")); DEFINE_STATIC_LOCAL(AtomicString, microsoftSans, ("Microsoft Sans Serif")); if (equalIgnoringCase(familyName, msSans)) -- 2.36.0