Changeset 136520 in webkit

Timestamp:

Dec 4, 2012, 9:58:44 AM (12 years ago)

Author:

mitz@apple.com

Message:

FontPlatformData has unnecessary m_textOrientation member
​https://bugs.webkit.org/show_bug.cgi?id=103971

Reviewed by Darin Adler.

Nothing in SimpleFontData depends on the FontPlatformData’s textOrientation, so we don’t
need separate data for vertical-right and upright. We simply choose between
verticalRightOrientationFontData() and uprightOrientationFontData() based on the
textOrientation in the FontDescription.

• WebCore.exp.in: Updated FontPlatformData constructor exports.

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData): Removed the text orientation bit from the hash key,
and updated for the removal of the TextOrientation parameter to
CachedFont::platformDataFromCustomData().

• loader/cache/CachedFont.cpp:

(WebCore::CachedFont::platformDataFromCustomData): Removed the TextOrientation parameter.

• loader/cache/CachedFont.h:

• platform/graphics/FontCache.cpp:

(WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey): Removed the TextOrientation
parameter and initializer.
(WebCore::FontPlatformDataCacheKey::operator==): Updated for removal of m_textOrientation
member variable.
(FontPlatformDataCacheKey): Removed m_textOrientation member variable.
(WebCore::computeHash): Removed text orientation bit from the hash.
(WebCore::FontCache::getCachedFontPlatformData): Updated for FontPlatformDataCacheKey
change.

• platform/graphics/FontPlatformData.cpp:

(WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameters and
initializers.
(WebCore::FontPlatformData::operator=): Updated for removal of m_textOrientation
member variable.

• platform/graphics/FontPlatformData.h:

(FontPlatformData): Removed m_textOrientation member variable, removed TextOrientation
parameters from constructors.
(WebCore::FontPlatformData::hash): Removed text orientation bit.
(WebCore::FontPlatformData::operator==): Updated for removed member variable.

• platform/graphics/cairo/FontCustomPlatformData.h:

(FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/chromium/FontCacheAndroid.cpp:

(WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.

• platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
initializer.

• platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:

(WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
initializers.
(WebCore::FontPlatformData::operator=): Updated for removed member variable.
(WebCore::FontPlatformData::operator==): Ditto.
(WebCore::FontPlatformData::hash): Removed text orientation bit.

• platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:

(FontPlatformData): Removed TextOrientation parameter from the constructor declaration.

• platform/graphics/mac/FontCacheMac.mm:

(WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.

• platform/graphics/mac/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/mac/FontCustomPlatformData.h:

(FontCustomPlatformData): Removed TextOrientation parameter from declaration of
fontPlatformData().

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::getCompositeFontReferenceFontData): Updated for FontPlatformData
change.

• platform/graphics/pango/FontCustomPlatformDataPango.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/qt/FontCustomPlatformData.h:

• platform/graphics/qt/FontCustomPlatformDataQt.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Ditto.

• platform/graphics/skia/FontCacheSkia.cpp:

(WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.

• platform/graphics/skia/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/skia/FontCustomPlatformData.h:

• platform/graphics/win/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/win/FontCustomPlatformData.h:

• platform/graphics/win/FontCustomPlatformDataCairo.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/win/FontCustomPlatformDataCairo.h:

• platform/graphics/win/FontPlatformDataCGWin.cpp:

(WebCore::FontPlatformData::FontPlatformData): Removed m_textOrientation initializer.

• platform/graphics/win/FontPlatformDataCairoWin.cpp:

(WebCore::FontPlatformData::FontPlatformData): Ditto.

• platform/graphics/win/FontPlatformDataWin.cpp:

(WebCore::FontPlatformData::FontPlatformData): Ditto.

• platform/graphics/wince/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.

• platform/graphics/wince/FontCustomPlatformData.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (2 diffs)
• css/CSSFontFaceSource.cpp (modified) (2 diffs)
• loader/cache/CachedFont.cpp (modified) (2 diffs)
• loader/cache/CachedFont.h (modified) (2 diffs)
• platform/graphics/FontCache.cpp (modified) (6 diffs)
• platform/graphics/FontPlatformData.cpp (modified) (6 diffs)
• platform/graphics/FontPlatformData.h (modified) (6 diffs)
• platform/graphics/cairo/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/chromium/FontCacheAndroid.cpp (modified) (2 diffs)
• platform/graphics/cocoa/FontPlatformDataCocoa.mm (modified) (1 diff)
• platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp (modified) (1 diff)
• platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp (modified) (10 diffs)
• platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h (modified) (3 diffs)
• platform/graphics/mac/FontCacheMac.mm (modified) (1 diff)
• platform/graphics/mac/FontCustomPlatformData.cpp (modified) (1 diff)
• platform/graphics/mac/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)
• platform/graphics/pango/FontCustomPlatformDataPango.cpp (modified) (1 diff)
• platform/graphics/qt/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/qt/FontCustomPlatformDataQt.cpp (modified) (1 diff)
• platform/graphics/skia/FontCacheSkia.cpp (modified) (1 diff)
• platform/graphics/skia/FontCustomPlatformData.cpp (modified) (2 diffs)
• platform/graphics/skia/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/win/FontCustomPlatformData.cpp (modified) (1 diff)
• platform/graphics/win/FontCustomPlatformData.h (modified) (2 diffs)
• platform/graphics/win/FontCustomPlatformDataCairo.cpp (modified) (1 diff)
• platform/graphics/win/FontCustomPlatformDataCairo.h (modified) (1 diff)
• platform/graphics/win/FontPlatformDataCGWin.cpp (modified) (1 diff)
• platform/graphics/win/FontPlatformDataCairoWin.cpp (modified) (1 diff)
• platform/graphics/win/FontPlatformDataWin.cpp (modified) (1 diff)
• platform/graphics/wince/FontCustomPlatformData.cpp (modified) (1 diff)
• platform/graphics/wince/FontCustomPlatformData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-12-04  Dan Bernstein  <mitz@apple.com>
+
+        FontPlatformData has unnecessary m_textOrientation member
+        https://bugs.webkit.org/show_bug.cgi?id=103971
+
+        Reviewed by Darin Adler.
+
+        Nothing in SimpleFontData depends on the FontPlatformData’s textOrientation, so we don’t
+        need separate data for vertical-right and upright. We simply choose between
+        verticalRightOrientationFontData() and uprightOrientationFontData() based on the
+        textOrientation in the FontDescription.
+
+        * WebCore.exp.in: Updated FontPlatformData constructor exports.
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData): Removed the text orientation bit from the hash key,
+        and updated for the removal of the TextOrientation parameter to
+        CachedFont::platformDataFromCustomData().
+
+        * loader/cache/CachedFont.cpp:
+        (WebCore::CachedFont::platformDataFromCustomData): Removed the TextOrientation parameter.
+        * loader/cache/CachedFont.h:
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey): Removed the TextOrientation
+        parameter and initializer.
+        (WebCore::FontPlatformDataCacheKey::operator==): Updated for removal of m_textOrientation
+        member variable.
+        (FontPlatformDataCacheKey): Removed m_textOrientation member variable.
+        (WebCore::computeHash): Removed text orientation bit from the hash.
+        (WebCore::FontCache::getCachedFontPlatformData): Updated for FontPlatformDataCacheKey
+        change.
+
+        * platform/graphics/FontPlatformData.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameters and
+        initializers.
+        (WebCore::FontPlatformData::operator=): Updated for removal of m_textOrientation
+        member variable.
+        * platform/graphics/FontPlatformData.h:
+        (FontPlatformData): Removed m_textOrientation member variable, removed TextOrientation
+        parameters from constructors.
+        (WebCore::FontPlatformData::hash): Removed text orientation bit.
+        (WebCore::FontPlatformData::operator==): Updated for removed member variable.
+
+        * platform/graphics/cairo/FontCustomPlatformData.h:
+        (FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+
+        * platform/graphics/chromium/FontCacheAndroid.cpp:
+        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
+
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
+        initializer.
+
+        * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
+        initializers.
+        (WebCore::FontPlatformData::operator=): Updated for removed member variable.
+        (WebCore::FontPlatformData::operator==): Ditto.
+        (WebCore::FontPlatformData::hash): Removed text orientation bit.
+
+        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:
+        (FontPlatformData): Removed TextOrientation parameter from the constructor declaration.
+
+        * platform/graphics/mac/FontCacheMac.mm:
+        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
+
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+
+        * platform/graphics/mac/FontCustomPlatformData.h:
+        (FontCustomPlatformData): Removed TextOrientation parameter from declaration of
+        fontPlatformData().
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::getCompositeFontReferenceFontData): Updated for FontPlatformData
+        change.
+
+        * platform/graphics/pango/FontCustomPlatformDataPango.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/qt/FontCustomPlatformData.h:
+
+        * platform/graphics/qt/FontCustomPlatformDataQt.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Ditto.
+
+        * platform/graphics/skia/FontCacheSkia.cpp:
+        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
+
+        * platform/graphics/skia/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/skia/FontCustomPlatformData.h:
+
+        * platform/graphics/win/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/win/FontCustomPlatformData.h:
+
+        * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/win/FontCustomPlatformDataCairo.h:
+
+        * platform/graphics/win/FontPlatformDataCGWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Removed m_textOrientation initializer.
+
+        * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Ditto.
+
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Ditto.
+
+        * platform/graphics/wince/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
+        * platform/graphics/wince/FontCustomPlatformData.h:
+
 2012-12-04  Charlie Reis  <creis@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in ¶

@@ -1632 +1632 @@
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore15GraphicsContextC1EP9CGContext
-__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
-__ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
+__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
+__ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
 __ZN7WebCore16colorFromNSColorEP7NSColor
 __ZN7WebCore16enclosingIntRectERK7_NSRect
@@ -1928 +1928 @@
 __ZN7WebCore15startOfDocumentERKNS_15VisiblePositionE
 __ZN7WebCore15startOfSentenceERKNS_15VisiblePositionE
-__ZN7WebCore16FontPlatformDataC1EP8__GSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
+__ZN7WebCore16FontPlatformDataC1EP8__GSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
 __ZN7WebCore16ThreadGlobalData26sharedMainThreadStaticDataE
 __ZN7WebCore16VisibleSelection27selectionFromContentsOfNodeEPNS_4NodeE

trunk/Source/WebCore/css/CSSFontFaceSource.cpp ¶

@@ -112 +112 @@
 
     // See if we have a mapping in our FontData cache.
-    unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 6 | fontDescription.widthVariant() << 4
-                       | (fontDescription.textOrientation() == TextOrientationUpright ? 8 : 0) | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
+    unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 5 | fontDescription.widthVariant() << 3
+                       | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
 
     RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(hashKey, 0).iterator->value;
@@ -166 +166 @@
 
                 fontData = SimpleFontData::create(m_font->platformDataFromCustomData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic,
-                    fontDescription.orientation(), fontDescription.textOrientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false);
+                    fontDescription.orientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false);
             }
         } else {

trunk/Source/WebCore/loader/cache/CachedFont.cpp ¶

@@ -116 +116 @@
 }
 
-FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode renderingMode)
+FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode renderingMode)
 {
 #if ENABLE(SVG_FONTS)
@@ -124 +124 @@
 #ifdef STORE_FONT_CUSTOM_PLATFORM_DATA
     ASSERT(m_fontData);
-    return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, orientation, textOrientation, widthVariant, renderingMode);
+    return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, orientation, widthVariant, renderingMode);
 #else
     return FontPlatformData();

trunk/Source/WebCore/loader/cache/CachedFont.h ¶

@@ -32 +32 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 
 namespace WebCore {
@@ -57 +56 @@
 
     bool ensureCustomFontData();
-    FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
+    FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 
 #if ENABLE(SVG_FONTS)

trunk/Source/WebCore/platform/graphics/FontCache.cpp ¶

@@ -63 +63 @@
     FontPlatformDataCacheKey(const AtomicString& family = AtomicString(), unsigned size = 0, unsigned weight = 0, bool italic = false,
                              bool isPrinterFont = false, FontRenderingMode renderingMode = NormalRenderingMode, FontOrientation orientation = Horizontal,
-                             TextOrientation textOrientation = TextOrientationVerticalRight, FontWidthVariant widthVariant = RegularWidth)
+                             FontWidthVariant widthVariant = RegularWidth)
         : m_size(size)
         , m_weight(weight)
@@ -71 +71 @@
         , m_renderingMode(renderingMode)
         , m_orientation(orientation)
-        , m_textOrientation(textOrientation)
         , m_widthVariant(widthVariant)
     {
@@ -83 +82 @@
         return equalIgnoringCase(m_family, other.m_family) && m_size == other.m_size && 
                m_weight == other.m_weight && m_italic == other.m_italic && m_printerFont == other.m_printerFont &&
-               m_renderingMode == other.m_renderingMode && m_orientation == other.m_orientation && m_textOrientation == other.m_textOrientation && m_widthVariant == other.m_widthVariant;
+               m_renderingMode == other.m_renderingMode && m_orientation == other.m_orientation && m_widthVariant == other.m_widthVariant;
     }
 
@@ -93 +92 @@
     FontRenderingMode m_renderingMode;
     FontOrientation m_orientation;
-    TextOrientation m_textOrientation;
     FontWidthVariant m_widthVariant;
 
@@ -107 +105 @@
         fontKey.m_weight,
         fontKey.m_widthVariant,
-        static_cast<unsigned>(fontKey.m_textOrientation) << 4 | static_cast<unsigned>(fontKey.m_orientation) << 3 | static_cast<unsigned>(fontKey.m_italic) << 2 | static_cast<unsigned>(fontKey.m_printerFont) << 1 | static_cast<unsigned>(fontKey.m_renderingMode)
+        static_cast<unsigned>(fontKey.m_orientation) << 3 | static_cast<unsigned>(fontKey.m_italic) << 2 | static_cast<unsigned>(fontKey.m_printerFont) << 1 | static_cast<unsigned>(fontKey.m_renderingMode)
     };
     return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
@@ -202 +200 @@
     FontPlatformDataCacheKey key(familyName, fontDescription.computedPixelSize(), fontDescription.weight(), fontDescription.italic(),
                                  fontDescription.usePrinterFont(), fontDescription.renderingMode(), fontDescription.orientation(),
-                                 fontDescription.textOrientation(), fontDescription.widthVariant());
+                                 fontDescription.widthVariant());
     FontPlatformData* result = 0;
     bool foundResult;

trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp ¶

@@ -40 +40 @@
     , m_syntheticOblique(false)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
     , m_size(0)
     , m_widthVariant(RegularWidth)
@@ -68 +67 @@
     , m_syntheticOblique(false)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
     , m_size(0)
     , m_widthVariant(RegularWidth)
@@ -90 +88 @@
 }
 
-FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_syntheticBold(syntheticBold)
     , m_syntheticOblique(syntheticOblique)
     , m_orientation(orientation)
-    , m_textOrientation(textOrientation)
     , m_size(size)
     , m_widthVariant(widthVariant)
@@ -117 +114 @@
 
 #if OS(DARWIN) && (USE(CG) || USE(SKIA_ON_MAC_CHROMIUM))
-FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
-                                   TextOrientation textOrientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_syntheticBold(syntheticBold)
     , m_syntheticOblique(syntheticOblique)
     , m_orientation(orientation)
-    , m_textOrientation(textOrientation)
     , m_size(size)
     , m_widthVariant(widthVariant)
@@ -138 +133 @@
     , m_syntheticOblique(source.m_syntheticOblique)
     , m_orientation(source.m_orientation)
-    , m_textOrientation(source.m_textOrientation)
     , m_size(source.m_size)
     , m_widthVariant(source.m_widthVariant)
@@ -159 +153 @@
     m_syntheticOblique = other.m_syntheticOblique;
     m_orientation = other.m_orientation;
-    m_textOrientation = other.m_textOrientation;
     m_size = other.m_size;
     m_widthVariant = other.m_widthVariant;

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

@@ -43 +43 @@
 #include "FontOrientation.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 
 #if PLATFORM(WIN)
@@ -107 +106 @@
     FontPlatformData(const FontPlatformData&);
     FontPlatformData(const FontDescription&, const AtomicString& family);
-    FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal,
-                     TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
+    FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
 
 #if OS(DARWIN)
     FontPlatformData(NSFont*, float size, bool isPrinterFont = false, bool syntheticBold = false, bool syntheticOblique = false,
-                     FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
-    FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation,
-                     TextOrientation, FontWidthVariant);
+                     FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
+#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+    FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);
 #endif
 #endif
@@ -161 +158 @@
 #endif
     FontOrientation orientation() const { return m_orientation; }
-    TextOrientation textOrientation() const { return m_textOrientation; }
     FontWidthVariant widthVariant() const { return m_widthVariant; }
 
@@ -182 +178 @@
         ASSERT(m_font || !m_cgFont);
 #endif
-        uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_isPrinterFont << 4 | m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
+        uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_isPrinterFont << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
         return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
 #elif USE(CAIRO)
@@ -203 +199 @@
 #endif
             && m_orientation == other.m_orientation
-            && m_textOrientation == other.m_textOrientation
             && m_widthVariant == other.m_widthVariant;
     }
@@ -251 +246 @@
     bool m_syntheticOblique;
     FontOrientation m_orientation;
-    TextOrientation m_textOrientation;
     float m_size;
     FontWidthVariant m_widthVariant;

trunk/Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h ¶

@@ -26 +26 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
@@ -43 +42 @@
     FontCustomPlatformData(FT_Face, SharedBuffer*);
     ~FontCustomPlatformData();
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
     static bool supportsFormat(const String&);
 

trunk/Source/WebCore/platform/graphics/chromium/FontCacheAndroid.cpp ¶

@@ -179 +179 @@
                                           (style & SkTypeface::kBold) && !typeface->isBold(),
                                           (style & SkTypeface::kItalic) && !typeface->isItalic(),
-                                          fontDescription.orientation(),
-                                          fontDescription.textOrientation());
+                                          fontDescription.orientation());
     } else {
         typeface = SkTypeface::CreateFromName(name, SkTypeface::kNormal);
@@ -204 +203 @@
                                           (style & SkTypeface::kBold) && !typeface->isBold(),
                                           (style & SkTypeface::kItalic) && !typeface->isItalic(),
-                                          fontDescription.orientation(),
-                                          fontDescription.textOrientation());
+                                          fontDescription.orientation());
         }
     }

trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm ¶

@@ -46 +46 @@
 #endif  // PLATFORM(MAC)
 
-FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
-                                   TextOrientation textOrientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_syntheticBold(syntheticBold)
     , m_syntheticOblique(syntheticOblique)
     , m_orientation(orientation)
-    , m_textOrientation(textOrientation)
     , m_size(size)
     , m_widthVariant(widthVariant)

trunk/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp ¶

@@ -60 +60 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
 {
     return FontPlatformData(m_fontFace, size, bold, italic);

trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp ¶

@@ -98 +98 @@
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
 {
 }
@@ -109 +108 @@
     , m_fakeItalic(false)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
 {
 }
@@ -120 +118 @@
     , m_fakeItalic(fakeItalic)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
 {
 }
@@ -132 +129 @@
     , m_fakeItalic(src.m_fakeItalic)
     , m_orientation(src.m_orientation)
-    , m_textOrientation(src.m_textOrientation)
     , m_style(src.m_style)
     , m_harfbuzzFace(src.m_harfbuzzFace)
@@ -139 +135 @@
 }
 
-FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation, TextOrientation textOrientation)
+FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
     : m_typeface(tf)
     , m_family(family)
@@ -147 +143 @@
     , m_fakeItalic(fakeItalic)
     , m_orientation(orientation)
-    , m_textOrientation(textOrientation)
 {
     SkSafeRef(m_typeface);
@@ -161 +156 @@
     , m_fakeItalic(src.m_fakeItalic)
     , m_orientation(src.m_orientation)
-    , m_textOrientation(src.m_textOrientation)
     , m_harfbuzzFace(src.m_harfbuzzFace)
 {
@@ -202 +196 @@
     m_harfbuzzFace = src.m_harfbuzzFace;
     m_orientation = src.m_orientation;
-    m_textOrientation = src.m_textOrientation;
     m_style = src.m_style;
     m_emSizeInFontUnits = src.m_emSizeInFontUnits;
@@ -257 +250 @@
         && m_fakeItalic == a.m_fakeItalic
         && m_orientation == a.m_orientation
-        && m_textOrientation == a.m_textOrientation
         && m_style == a.m_style;
 }
@@ -264 +256 @@
 {
     unsigned h = SkTypeface::UniqueID(m_typeface);
-    h ^= 0x01010101 * ((static_cast<int>(m_textOrientation) << 3) | (static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_fakeBold) << 1) | static_cast<int>(m_fakeItalic));
+    h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_fakeBold) << 1) | static_cast<int>(m_fakeItalic));
 
     // This memcpy is to avoid a reinterpret_cast that breaks strict-aliasing

trunk/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h ¶

@@ -37 +37 @@
 #include "SharedBuffer.h"
 #include "SkPaint.h"
-#include "TextOrientation.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
@@ -72 +71 @@
     FontPlatformData(float textSize, bool fakeBold, bool fakeItalic);
     FontPlatformData(const FontPlatformData&);
-    FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight);
+    FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal);
     FontPlatformData(const FontPlatformData& src, float textSize);
     ~FontPlatformData();
@@ -145 +144 @@
     bool m_fakeItalic;
     FontOrientation m_orientation;
-    TextOrientation m_textOrientation;
     FontRenderStyle m_style;
 #if USE(HARFBUZZ_NG)

trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm ¶

@@ -239 +239 @@
     // FontPlatformData::font() can be null for the case of Chromium out-of-process font loading.
     // In that case, we don't want to use the platformData.
-    OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.textOrientation(), fontDescription.widthVariant()));
+    OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant()));
     if (!platformData->font())
         return 0;

trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp ¶

@@ -89 +89 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode)
 {
-    return FontPlatformData(m_cgFont, size, bold, italic, orientation, textOrientation, widthVariant);
+    return FontPlatformData(m_cgFont, size, bold, italic, orientation, widthVariant);
 }
 

trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h ¶

@@ -25 +25 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <CoreFoundation/CFBase.h>
 #include <wtf/Forward.h>
@@ -57 +56 @@
     ~FontCustomPlatformData();
 
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 
     static bool supportsFormat(const String&);

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm ¶

@@ -128 +128 @@
             bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
 
-            FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().textOrientation(), platformData().widthVariant());
+            FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
             SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont());
             if (value) {

trunk/Source/WebCore/platform/graphics/pango/FontCustomPlatformDataPango.cpp ¶

@@ -31 +31 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
 {
     return FontPlatformData(m_fontFace, size, bold, italic);

trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformData.h ¶

@@ -26 +26 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <QRawFont>
 #include <wtf/FastAllocBase.h>
@@ -42 +41 @@
     FontCustomPlatformData() { }
 
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
                                       FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 

trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformDataQt.cpp ¶

@@ -29 +29 @@
 namespace WebCore {
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
 {
     Q_ASSERT(m_rawFont.isValid());

trunk/Source/WebCore/platform/graphics/skia/FontCacheSkia.cpp ¶

@@ -181 +181 @@
                              (style & SkTypeface::kBold) && !tf->isBold(),
                              (style & SkTypeface::kItalic) && !tf->isItalic(),
-                             fontDescription.orientation(),
-                             fontDescription.textOrientation());
+                             fontDescription.orientation());
     tf->unref();
     return result;

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

@@ -67 +67 @@
 
 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation,
-                                                          TextOrientation textOrientation, FontWidthVariant, FontRenderingMode mode)
+                                                          FontWidthVariant, FontRenderingMode mode)
 {
 #if OS(WINDOWS)
@@ -104 +104 @@
 #elif OS(UNIX)
     ASSERT(m_fontReference);
-    return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation, textOrientation);
+    return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation);
 #else
     notImplemented();

trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h ¶

@@ -36 +36 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
@@ -68 +67 @@
     ~FontCustomPlatformData();
 
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
                                       FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 

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, FontWidthVariant, FontRenderingMode renderingMode)
 {
     ASSERT(m_fontReference);

trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.h ¶

@@ -25 +25 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <windows.h>
 #include <wtf/Forward.h>
@@ -49 +48 @@
     ~FontCustomPlatformData();
 
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
                                       FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 

trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp ¶

@@ -36 +36 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant)
 {
     return FontPlatformData(m_fontFace, size, bold, italic);

trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h ¶

@@ -43 +43 @@
     ~FontCustomPlatformData();
 
-    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
+    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
 
     static bool supportsFormat(const String&);

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

@@ -119 +119 @@
     , m_syntheticOblique(oblique)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
     , m_size(size)
     , m_widthVariant(RegularWidth)

trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp ¶

@@ -61 +61 @@
     , m_size(size)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
     , m_widthVariant(RegularWidth)
     , m_scaledFont(0)

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

@@ -42 +42 @@
     , m_size(size)
     , m_orientation(Horizontal)
-    , m_textOrientation(TextOrientationVerticalRight)
     , m_widthVariant(RegularWidth)
 #if USE(CG)

trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp ¶

@@ -46 +46 @@
 }
 
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode renderingMode)
 {
     FontDescription fontDesc;

trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.h ¶

@@ -25 +25 @@
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
-#include "TextOrientation.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/text/WTFString.h>
@@ -51 +50 @@
         ~FontCustomPlatformData();
 
-        FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
+        FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
 
         static bool supportsFormat(const String&);