Reviewed by Sam Weinig.

        - fix small caps rendering

        Covered by an existing test,

        * platform/graphics/win/FontDataWin.cpp:
        (WebCore::FontData::smallCapsFontData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 30f3e4a200001f3760f2f487120e36fb4a797444..bd3f50f431185735ea1a9b3628064a7e68110f41 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-02  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix small caps rendering
+
+        Covered by an existing test,
+
+        * platform/graphics/win/FontDataWin.cpp:
+        (WebCore::FontData::smallCapsFontData):
+
 2008-01-02  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Oliver.

diff --git a/WebCore/platform/graphics/win/FontDataWin.cpp b/WebCore/platform/graphics/win/FontDataWin.cpp
index faf0fe0346659f03d0477b4ca30cea22f0dac239..4399102a0a982949c62e274eaa3a89fa2570cf67 100644 (file)
--- a/WebCore/platform/graphics/win/FontDataWin.cpp
+++ b/WebCore/platform/graphics/win/FontDataWin.cpp
@@ -170,7 +170,7 @@ FontData* FontData::smallCapsFontData(const FontDescription& fontDescription) co
         } else {
             LOGFONT winfont;
             GetObject(m_font.hfont(), sizeof(LOGFONT), &winfont);
-            winfont.lfHeight = -lroundf(smallCapsHeight * m_font.useGDI() ? 1 : 32);
+            winfont.lfHeight = -lroundf(smallCapsHeight * (m_font.useGDI() ? 1 : 32));
             HFONT hfont = CreateFontIndirect(&winfont);
             m_smallCapsFontData = new FontData(FontPlatformData(hfont, smallCapsHeight, fontDescription.bold(), fontDescription.italic(), m_font.useGDI()));
         }