Changeset 95097 in webkit

Timestamp:

Sep 14, 2011 10:04:12 AM (13 years ago)

Author:

reed@google.com

Message:

query SystemParametersInfo for GDI font smoothing settings
​https://bugs.webkit.org/show_bug.cgi?id=68080

Reviewed by Stephen White.

No new tests. fixes antialiasing issues based on User settings

• platform/graphics/skia/SkiaFontWin.cpp:

(WebCore::getDefaultGDITextFlags):
(WebCore::setupPaintForFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/SkiaFontWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-14  Mike Reed  <reed@google.com>
+
+        query SystemParametersInfo for GDI font smoothing settings
+        https://bugs.webkit.org/show_bug.cgi?id=68080
+
+        Reviewed by Stephen White.
+
+        No new tests. fixes antialiasing issues based on User settings
+
+        * platform/graphics/skia/SkiaFontWin.cpp:
+        (WebCore::getDefaultGDITextFlags):
+        (WebCore::setupPaintForFont):
+
 2011-09-13  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp

@@ -100 +100 @@
 }
 
+// Lookup the current system settings for font smoothing.
+// We cache these values for performance, but if the browser has away to be
+// notified when these change, we could re-query them at that time.
+static uint32_t getDefaultGDITextFlags()
+{
+    static bool gInited;
+    static uint32_t gFlags;
+    if (!gInited) {
+        BOOL enabled;
+        if (SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &enabled, 0) && enabled) {
+            gFlags |= SkPaint::kAntiAlias_Flag;
+
+            UINT smoothType;
+            if (SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &smoothType, 0)) {
+                if (FE_FONTSMOOTHINGCLEARTYPE == smoothType)
+                    gFlags |= SkPaint::kLCDRenderText_Flag;
+            }
+        }
+        gInited = true;
+    }
+    return gFlags;
+}
+
 static void setupPaintForFont(HFONT hfont, SkPaint* paint, PlatformContextSkia* pcs)
 {
@@ -119 +142 @@
 
     uint32_t flags = paint->getFlags();
-    // our defaults
-    flags |= SkPaint::kAntiAlias_Flag;
+    // clear our flags initially, and then selectively set them
+    // based on the LOGFONT quality
+    flags &= SkPaint::kAntiAlias_Flag;
+    flags &= SkPaint::kLCDRenderText_Flag;
+
+    switch (info.lfQuality) {
+    case NONANTIALIASED_QUALITY:
+        break;
+    case ANTIALIASED_QUALITY:
+        flags |= SkPaint::kAntiAlias_Flag;
+        break;
+    case CLEARTYPE_QUALITY:
+        flags |= SkPaint::kAntiAlias_Flag;
+        flags |= SkPaint::kLCDRenderText_Flag;
+        break;
+    default:
+        flags |= getDefaultGDITextFlags();
+        break;
+    }
+
+    // do this check after our switch on lfQuality
     if (disableTextLCD(pcs))
         flags &= ~SkPaint::kLCDRenderText_Flag;
-    else
-        flags |= SkPaint::kLCDRenderText_Flag;
-
-    switch (info.lfQuality) {
-    case NONANTIALIASED_QUALITY:
-        flags &= ~SkPaint::kAntiAlias_Flag;
-        flags &= ~SkPaint::kLCDRenderText_Flag;
-        break;
-    case ANTIALIASED_QUALITY:
-        flags &= ~SkPaint::kLCDRenderText_Flag;
-        break;
-    default:
-        break;
-    }
+
     paint->setFlags(flags);
 }