Changeset 28867 for trunk/WebCore/platform/graphics/FontCache.cpp

Timestamp:

12/19/07 11:24:10 (12 months ago)

Author:

hyatt@apple.com

Message:

Add support for GDI text on Windows.

Files:

• trunk/WebCore/platform/graphics/FontCache.cpp (modified) (5 diffs)

trunk/WebCore/platform/graphics/FontCache.cpp

@@ -41 +41 @@
 struct FontPlatformDataCacheKey {
     FontPlatformDataCacheKey(const AtomicString& family = AtomicString(), unsigned size = 0, bool bold = false, bool italic = false,
-                             bool isPrinterFont = false)
+                             bool isPrinterFont = false, FontRenderingMode renderingMode = NormalRenderingMode)
         : m_family(family)
         , m_size(size)
@@ -47 +47 @@
         , m_italic(italic)
         , m_printerFont(isPrinterFont)
+        , m_renderingMode(renderingMode)
     {
     }
@@ -53 +54 @@
     {
         return equalIgnoringCase(m_family, other.m_family) && m_size == other.m_size && 
-               m_bold == other.m_bold && m_italic == other.m_italic && m_printerFont == other.m_printerFont;
+               m_bold == other.m_bold && m_italic == other.m_italic && m_printerFont == other.m_printerFont &&
+               m_renderingMode == other.m_renderingMode;
     }
     
@@ -61 +63 @@
     bool m_italic;
     bool m_printerFont;
+    FontRenderingMode m_renderingMode;
 };
 
 inline unsigned computeHash(const FontPlatformDataCacheKey& fontKey)
 {
-    unsigned hashCodes[3] = {
+    unsigned hashCodes[4] = {
         CaseFoldingHash::hash(fontKey.m_family),
         fontKey.m_size,
-        static_cast<unsigned>(fontKey.m_bold) << 2 | static_cast<unsigned>(fontKey.m_italic) << 1 | static_cast<unsigned>(fontKey.m_printerFont)
+        static_cast<unsigned>(fontKey.m_bold) << 3 | static_cast<unsigned>(fontKey.m_italic) << 2 | static_cast<unsigned>(fontKey.m_printerFont) << 1 |
+        static_cast<unsigned>(fontKey.m_renderingMode)
     };
-    return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), 3 * sizeof(unsigned) / sizeof(UChar));
+    return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), 4 * sizeof(unsigned) / sizeof(UChar));
 }
 
@@ -142 +146 @@
 
     FontPlatformDataCacheKey key(familyName, fontDescription.computedPixelSize(), fontDescription.bold(), fontDescription.italic(),
-                                 fontDescription.usePrinterFont());
+                                 fontDescription.usePrinterFont(), fontDescription.renderingMode());
     FontPlatformData* result = 0;
     bool foundResult;