Changeset 79174 in webkit

Timestamp:

Feb 20, 2011 8:37:38 PM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-02-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r79169.
​http://trac.webkit.org/changeset/79169
​https://bugs.webkit.org/show_bug.cgi?id=54846

Made unexpected results for tests without CJK characters
(Requested by tkent on #webkit).

• platform/graphics/chromium/FontCacheChromiumWin.cpp: (WebCore::FontCache::createFontPlatformData):
• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp: (WebCore::FontPlatformData::FontPlatformData): (WebCore::FontPlatformData::operator=):
• platform/graphics/chromium/FontPlatformDataChromiumWin.h: (WebCore::FontPlatformData::orientation):
• platform/graphics/skia/FontCustomPlatformData.cpp: (WebCore::FontCustomPlatformData::fontPlatformData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontCacheChromiumWin.cpp (modified) (3 diffs)
• platform/graphics/chromium/FontPlatformDataChromiumWin.cpp (modified) (5 diffs)
• platform/graphics/chromium/FontPlatformDataChromiumWin.h (modified) (3 diffs)
• platform/graphics/skia/FontCustomPlatformData.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r79169.
+        http://trac.webkit.org/changeset/79169
+        https://bugs.webkit.org/show_bug.cgi?id=54846
+
+        Made unexpected results for tests without CJK characters
+        (Requested by tkent on #webkit).
+
+        * platform/graphics/chromium/FontCacheChromiumWin.cpp:
+        (WebCore::FontCache::createFontPlatformData):
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::operator=):
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.h:
+        (WebCore::FontPlatformData::orientation):
+        * platform/graphics/skia/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+
 2011-02-20  Chun-Lung Huang  <alvincl.huang@gmail.com>
 

trunk/Source/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp

@@ -613 +613 @@
     FillLogFont(fontDescription, &winfont);
 
-    // 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
-    // Try to create hfont with family name "@font-family-name".
-    AtomicString updatedFamilyName;
-    if (fontDescription.orientation() == Vertical && !family.startsWith("@") && !family.isEmpty())
-        updatedFamilyName = "@" + String(family);
-    else
-        updatedFamilyName = family; 
-
     // Windows will always give us a valid pointer here, even if the face name 
     // is non-existent.  We have to double-check and see if the family name was 
     // really used.
     String winName;
-    HFONT hfont = createFontIndirectAndGetWinName(updatedFamilyName, &winfont, &winName);
+    HFONT hfont = createFontIndirectAndGetWinName(family, &winfont, &winName);
     if (!hfont)
         return 0;
@@ -632 +623 @@
     // FIXME: Do we need to use predefined fonts "guaranteed" to exist
     // when we're running in layout-test mode?
-    if (!equalIgnoringCase(updatedFamilyName, winName)) {
+    if (!equalIgnoringCase(family, winName)) {
         // For CJK fonts with both English and native names, 
         // GetTextFace returns a native name under the font's "locale"
@@ -640 +631 @@
         // compare it with what's requested in the first place.
         String altName;
-        if (fontDescription.orientation() == Vertical) {
-            if (!LookupAltName(family, altName) || !equalIgnoringCase("@" + altName, winName)) {
-                DeleteObject(hfont);
-                return 0;
-            }
-        } else {
-            if (!LookupAltName(updatedFamilyName, altName) || !equalIgnoringCase(altName, winName)) {
-                DeleteObject(hfont);
-                return 0;
-            }
+        if (!LookupAltName(family, altName) || 
+            !equalIgnoringCase(altName, winName)) {
+            DeleteObject(hfont);
+            return 0;
         }
     }
 
-    return new FontPlatformData(hfont, fontDescription.computedPixelSize(), fontDescription.orientation());
-}
-
-}
+    return new FontPlatformData(hfont,
+                                fontDescription.computedPixelSize());
+}
+
+}

trunk/Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

@@ -47 +47 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
-    , m_orientation(Horizontal)
 {
 }
@@ -56 +55 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
-    , m_orientation(Horizontal)
 {
 }
 
-FontPlatformData::FontPlatformData(HFONT font, float size, FontOrientation orientation)
+FontPlatformData::FontPlatformData(HFONT font, float size)
     : m_font(RefCountedHFONT::create(font))
     , m_size(size)
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
-    , m_orientation(orientation)
 {
 }
@@ -75 +72 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
-    , m_orientation(Horizontal)
 {
 }
@@ -84 +80 @@
     , m_scriptCache(0)
     , m_scriptFontProperties(0)
-    , m_orientation(Horizontal)
 {
 }
@@ -93 +88 @@
         m_font = data.m_font;
         m_size = data.m_size;
-        m_orientation = data.m_orientation;
 
         // The following fields will get re-computed if necessary.

trunk/Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.h

@@ -58 +58 @@
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
-    FontPlatformData(HFONT, float size, FontOrientation = Horizontal);
+    FontPlatformData(HFONT, float size);
     FontPlatformData(float size, bool bold, bool oblique);
     FontPlatformData(const FontPlatformData&);
@@ -71 +71 @@
     float size() const { return m_size; }
 
-    FontOrientation orientation() const { return m_orientation; }
+    FontOrientation orientation() const { return Horizontal; } // FIXME: Implement.
 
     unsigned hash() const
@@ -128 +128 @@
     RefPtr<RefCountedHFONT> m_font;
     float m_size;  // Point size of the font in pixels.
-    FontOrientation m_orientation;
 
     mutable SCRIPT_CACHE m_scriptCache;

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

@@ -79 +79 @@
         return FontPlatformData();
     }
-
-    String newName;
-    if (orientation == Vertical && !m_name.startsWith("@"))
-        newName = "@" + m_name;
-    else
-        newName = m_name;
-
-    memcpy(logFont.lfFaceName, newName.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * (1 + newName.length())); 
+    memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination(),
+           sizeof(logFont.lfFaceName[0]) * (1 + m_name.length()));
 
     // FIXME: almost identical to FillLogFont in FontCacheWin.cpp.
@@ -106 +100 @@
 
     HFONT hfont = CreateFontIndirect(&logFont);
-    return FontPlatformData(hfont, size, orientation);
+    return FontPlatformData(hfont, size);
 #elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
     ASSERT(m_fontReference);