Changeset 84996 in webkit

Timestamp:

Apr 26, 2011 6:15:40 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-26 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r84989.
​http://trac.webkit.org/changeset/84989
​https://bugs.webkit.org/show_bug.cgi?id=59566

REGRESSION (r84989): Lots of vertical text tests failing on
windows (Requested by weinig on #webkit).

• 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  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r84989.
+        http://trac.webkit.org/changeset/84989
+        https://bugs.webkit.org/show_bug.cgi?id=59566
+
+        REGRESSION (r84989): Lots of vertical text tests failing on
+        windows (Requested by weinig on #webkit).
+
+        * 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  Sam Weinig  <sam@webkit.org>
 

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

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

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

@@ -284 +284 @@
     if (hfont) {
         if (!familyName.isEmpty()) {
-            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); 
-            
+            FontPlatformData* result = getCachedFontPlatformData(font.fontDescription(), familyName);
             if (result)
                 fontData = getCachedFontData(result);
@@ -567 +560 @@
     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()), updatedFamilyName);
-    HFONT hfont = createGDIFont(updatedFamilyName, weight, fontDescription.italic(),
+    LONG weight = adjustedGDIFontWeight(toGDIFontWeight(fontDescription.weight()), family);
+    HFONT hfont = createGDIFont(family, 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)
@@ -604 +580 @@
     bool synthesizeItalic = fontDescription.italic() && !logFont.lfItalic;
 
-    FontPlatformData* result = new FontPlatformData(hfont, fontDescription.computedPixelSize(), synthesizeBold, synthesizeItalic, useGDI, fontDescription.orientation());
+    FontPlatformData* result = new FontPlatformData(hfont, fontDescription.computedPixelSize(), synthesizeBold, synthesizeItalic, useGDI);
 
 #if USE(CG)

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

@@ -60 +60 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, 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
-        newName = m_name;
-    memcpy(logFont.lfFaceName, newName.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + newName.length()));
+        memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
 
     logFont.lfHeight = -size;
@@ -97 +89 @@
 
     RetainPtr<CGFontRef> cgFont(AdoptCF, CGFontCreateWithPlatformFont(&logFont));
-    return FontPlatformData(hfont, cgFont.get(), size, bold, italic, renderingMode == AlternateRenderingMode, orientation);
+    return FontPlatformData(hfont, cgFont.get(), size, bold, italic, renderingMode == AlternateRenderingMode);
 }
 

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

@@ -115 +115 @@
 }
 
-FontPlatformData::FontPlatformData(HFONT hfont, CGFontRef font, float size, bool bold, bool oblique, bool useGDI, FontOrientation orientation)
+FontPlatformData::FontPlatformData(HFONT hfont, CGFontRef font, float size, bool bold, bool oblique, bool useGDI)
     : m_syntheticBold(bold)
     , m_syntheticOblique(oblique)
-    , m_orientation(orientation)
+    , m_orientation(Horizontal)
     , 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, FontOrientation orientation)
+FontPlatformData::FontPlatformData(HFONT font, float size, bool bold, bool oblique, bool useGDI)
     : m_font(RefCountedGDIHandle<HFONT>::create(font))
     , m_size(size)
-    , m_orientation(orientation)
+    , m_orientation(Horizontal)
     , m_textOrientation(TextOrientationVerticalRight)
     , m_widthVariant(RegularWidth)