Changeset 84989 in webkit

Timestamp:

Apr 26, 2011 5:17:41 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-26 Chun-Lung Huang <​alvincl.huang@gmail.com>

Reviewed by Adele Peterson.

On WebKit (Windows), glyphs in vertical text tests are rotated 90
degrees clockwise. ​https://bugs.webkit.org/show_bug.cgi?id=48459

This platform dependent patch makes WebKit (Windows) show the
vertical writing text correctly. Job was done by adding a prefix '@'
in front of the font family name (Windows Only). No new tests added.
Some layout tests images:
​http://www.flickr.com/photos/burorly/sets/72157625585506341/

• platform/graphics/FontPlatformData.h:
• platform/graphics/win/FontCacheWin.cpp: (WebCore::FontCache::getFontDataForCharacters): (WebCore::FontCache::createFontPlatformData):
• platform/graphics/win/FontCustomPlatformData.cpp: (WebCore::FontCustomPlatformData::fontPlatformData):
• platform/graphics/win/FontPlatformDataCGWin.cpp: (WebCore::FontPlatformData::FontPlatformData):
• platform/graphics/win/FontPlatformDataWin.cpp: (WebCore::FontPlatformData::FontPlatformData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontPlatformData.h (modified) (1 diff)
• platform/graphics/win/FontCacheWin.cpp (modified) (3 diffs)
• platform/graphics/win/FontCustomPlatformData.cpp (modified) (3 diffs)
• platform/graphics/win/FontPlatformDataCGWin.cpp (modified) (1 diff)
• platform/graphics/win/FontPlatformDataWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-26  Chun-Lung Huang  <alvincl.huang@gmail.com>
+
+        Reviewed by Adele Peterson.
+
+        On WebKit (Windows), glyphs in vertical text tests are rotated 90
+        degrees clockwise.  https://bugs.webkit.org/show_bug.cgi?id=48459
+
+        This platform dependent patch makes WebKit (Windows) show the
+        vertical writing text correctly.  Job was done by adding a prefix '@'
+        in front of the font family name (Windows Only). No new tests added.
+        Some layout tests images:
+        http://www.flickr.com/photos/burorly/sets/72157625585506341/
+
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+        (WebCore::FontCache::createFontPlatformData):
+        * platform/graphics/win/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        * platform/graphics/win/FontPlatformDataCGWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2011-04-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontPlatformData.h

@@ -197 +197 @@
 #endif
 #if PLATFORM(WIN)
-    FontPlatformData(HFONT, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
+    FontPlatformData(HFONT, float size, bool syntheticBold, bool syntheticOblique, bool useGDI, FontOrientation = Horizontal);
 #if USE(CG)
-    FontPlatformData(HFONT, CGFontRef, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
+    FontPlatformData(HFONT, CGFontRef, float size, bool syntheticBold, bool syntheticOblique, bool useGDI, FontOrientation = Horizontal);
 #endif
 #endif

trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp

@@ -284 +284 @@
     if (hfont) {
         if (!familyName.isEmpty()) {
-            FontPlatformData* result = getCachedFontPlatformData(font.fontDescription(), familyName);
+            FontPlatformData* result;
+            // Take the orientation into consideration. For vertical: add "@" in front of the family name.
+            // "@" is a built-in behaviour for Windows platform. http://msdn.microsoft.com/en-us/goglobal/bb688137
+            if (font.fontDescription().orientation() == Vertical && !familyName.startsWith("@"))
+                result = getCachedFontPlatformData(font.fontDescription(), "@" + String(familyName));
+            else
+                result = getCachedFontPlatformData(font.fontDescription(), familyName); 
+            
             if (result)
                 fontData = getCachedFontData(result);
@@ -560 +567 @@
     bool useGDI = fontDescription.renderingMode() == AlternateRenderingMode && !isLucidaGrande;
 
+    // Take the orientation into consideration. For vertical: add "@" in front of the family name.
+    // "@" is a built-in behaviour for Windows platform. http://msdn.microsoft.com/en-us/goglobal/bb688137
+    AtomicString updatedFamilyName;
+    if (fontDescription.orientation() == Vertical && !family.startsWith("@"))
+        updatedFamilyName = "@" + String(family);
+    else
+        updatedFamilyName = family; 
+
     // The logical size constant is 32. We do this for subpixel precision when rendering using Uniscribe.
     // This masks rounding errors related to the HFONT metrics being  different from the CGFont metrics.
     // FIXME: We will eventually want subpixel precision for GDI mode, but the scaled rendering doesn't
     // look as nice. That may be solvable though.
-    LONG weight = adjustedGDIFontWeight(toGDIFontWeight(fontDescription.weight()), family);
-    HFONT hfont = createGDIFont(family, weight, fontDescription.italic(),
+    LONG weight = adjustedGDIFontWeight(toGDIFontWeight(fontDescription.weight()), updatedFamilyName);
+    HFONT hfont = createGDIFont(updatedFamilyName, weight, fontDescription.italic(),
                                 fontDescription.computedPixelSize() * (useGDI ? 1 : 32), useGDI);
+
+    // Some fonts do not need to be rotated when displayed vertically.
+    // Or "@font-family-name" is not supported on user's platform.
+    // (e.g. no "@Times New Romain" or "@Arial"). Try to create hfont with original family name.
+    if (updatedFamilyName.startsWith("@") && !hfont) {
+        weight = adjustedGDIFontWeight(toGDIFontWeight(fontDescription.weight()), family);
+        hfont = createGDIFont(family, weight, fontDescription.italic(),
+        fontDescription.computedPixelSize() * (useGDI ? 1 : 32), useGDI);
+    }
 
     if (!hfont)
@@ -580 +604 @@
     bool synthesizeItalic = fontDescription.italic() && !logFont.lfItalic;
 
-    FontPlatformData* result = new FontPlatformData(hfont, fontDescription.computedPixelSize(), synthesizeBold, synthesizeItalic, useGDI);
+    FontPlatformData* result = new FontPlatformData(hfont, fontDescription.computedPixelSize(), synthesizeBold, synthesizeItalic, useGDI, fontDescription.orientation());
 
 #if USE(CG)

trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp

@@ -60 +60 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
 {
     ASSERT(m_fontReference);
@@ -66 +66 @@
 
     LOGFONT& logFont = *static_cast<LOGFONT*>(malloc(sizeof(LOGFONT)));
-    if (m_name.isNull())
+    if (m_name.isNull()) {
         TTGetNewFontName(&m_fontReference, logFont.lfFaceName, LF_FACESIZE, 0, 0);
+        m_name = logFont.lfFaceName;
+    }
+
+    // Take the orientation into consideration. For vertical: add "@" in front of the family name. (Windows)
+    String newName;
+    if (orientation == Vertical && !m_name.startsWith("@"))
+        newName = "@" + m_name; 
     else
-        memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
+        newName = m_name;
+    memcpy(logFont.lfFaceName, newName.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + newName.length()));
 
     logFont.lfHeight = -size;
@@ -89 +97 @@
 
     RetainPtr<CGFontRef> cgFont(AdoptCF, CGFontCreateWithPlatformFont(&logFont));
-    return FontPlatformData(hfont, cgFont.get(), size, bold, italic, renderingMode == AlternateRenderingMode);
+    return FontPlatformData(hfont, cgFont.get(), size, bold, italic, renderingMode == AlternateRenderingMode, orientation);
 }
 

trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp

@@ -115 +115 @@
 }
 
-FontPlatformData::FontPlatformData(HFONT hfont, CGFontRef font, float size, bool bold, bool oblique, bool useGDI)
+FontPlatformData::FontPlatformData(HFONT hfont, CGFontRef font, float size, bool bold, bool oblique, bool useGDI, FontOrientation orientation)
     : m_syntheticBold(bold)
     , m_syntheticOblique(oblique)
-    , m_orientation(Horizontal)
+    , m_orientation(orientation)
     , m_textOrientation(TextOrientationVerticalRight)
     , m_size(size)

trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-FontPlatformData::FontPlatformData(HFONT font, float size, bool bold, bool oblique, bool useGDI)
+FontPlatformData::FontPlatformData(HFONT font, float size, bool bold, bool oblique, bool useGDI, FontOrientation orientation)
     : m_font(RefCountedGDIHandle<HFONT>::create(font))
     , m_size(size)
-    , m_orientation(Horizontal)
+    , m_orientation(orientation)
     , m_textOrientation(TextOrientationVerticalRight)
     , m_widthVariant(RegularWidth)