2009-02-04 Dimitri Glazkov <dglazkov@chromium.org>

        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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a78d832a59064666e1af41e1a2b12a6400363a19..f32574fc518f48ec44767ce1a58c3ff4f86eb8a7 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-04  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Not reviewed, build fix.
+
+        Remove duplicate definition of msSans in FontCache::alternateFamilyName.
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore::alternateFamilyName):
+
 2009-02-04  Eric Seidel  <eric@webkit.org>
 
         Reviewed by George Staikos.

diff --git a/WebCore/platform/graphics/FontCache.cpp b/WebCore/platform/graphics/FontCache.cpp
index c3934913027d56e4849bbdb88b4ea8b179a9cd13..41b740a4fb1842427188457ba4e2c9df7a2e55a9 100644 (file)
--- 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))