[WinCairo] syntheticBoldOffset makes a font with embedded bitmap fonts shown as double strike in HiDPI

fujii · webkit-commit-queue · commit 61e50c83140b · 2018-01-31T07:28:23.000Z
https://bugs.webkit.org/show_bug.cgi?id=182093 Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2018-01-30 Reviewed by Alex Christensen. WebKit draws texts doubly by shifting 1px for fonts without bold fonts but bold font is desired. This synthetic bold method draws fonts with embedded bitmap fonts look like double strike in HiDPI. No new tests (Covered by the existing tests). * platform/graphics/win/FontCacheWin.cpp: (WebCore::createGDIFont): Overwrite lfWeight if the desired weight is bold and matched font weight is't bold and in WinCairo port. Fix wrong indentation. Canonical link: https://commits.webkit.org/198126@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2018-01-30  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] syntheticBoldOffset makes a font with embedded bitmap fonts shown as double strike in HiDPI
+        https://bugs.webkit.org/show_bug.cgi?id=182093
+
+        Reviewed by Alex Christensen.
+
+        WebKit draws texts doubly by shifting 1px for fonts without bold
+        fonts but bold font is desired. This synthetic bold method draws
+        fonts with embedded bitmap fonts look like double strike in HiDPI.
+
+        No new tests (Covered by the existing tests).
+
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::createGDIFont): Overwrite lfWeight if the desired weight
+        is bold and matched font weight is't bold and in WinCairo port.
+        Fix wrong indentation.
+
 2018-01-30  Youenn Fablet  <youenn@apple.com> and Oleksandr Skachkov  <gskachkov@gmail.com>
 
         FetchResponse should support ConsumeData callback on chunk data is received
diff --git a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
@@ -511,8 +511,13 @@ static GDIObject<HFONT> createGDIFont(const AtomicString& family, LONG desiredWe
     matchData.m_chosen.lfQuality = DEFAULT_QUALITY;
     matchData.m_chosen.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
 
-   if (desiredItalic && !matchData.m_chosen.lfItalic && synthesizeItalic)
-       matchData.m_chosen.lfItalic = 1;
+#if USE(CAIRO)
+    if (isGDIFontWeightBold(desiredWeight) && !isGDIFontWeightBold(matchData.m_chosen.lfWeight))
+        matchData.m_chosen.lfWeight = desiredWeight;
+#endif
+
+    if (desiredItalic && !matchData.m_chosen.lfItalic && synthesizeItalic)
+        matchData.m_chosen.lfItalic = 1;
 
     auto chosenFont = adoptGDIObject(::CreateFontIndirect(&matchData.m_chosen));
     if (!chosenFont)
