Changeset 136520 in webkit


Ignore:
Timestamp:
Dec 4, 2012 9:58:44 AM (11 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:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r136516 r136520  
     12012-12-04  Dan Bernstein  <mitz@apple.com>
     2
     3        FontPlatformData has unnecessary m_textOrientation member
     4        https://bugs.webkit.org/show_bug.cgi?id=103971
     5
     6        Reviewed by Darin Adler.
     7
     8        Nothing in SimpleFontData depends on the FontPlatformData’s textOrientation, so we don’t
     9        need separate data for vertical-right and upright. We simply choose between
     10        verticalRightOrientationFontData() and uprightOrientationFontData() based on the
     11        textOrientation in the FontDescription.
     12
     13        * WebCore.exp.in: Updated FontPlatformData constructor exports.
     14
     15        * css/CSSFontFaceSource.cpp:
     16        (WebCore::CSSFontFaceSource::getFontData): Removed the text orientation bit from the hash key,
     17        and updated for the removal of the TextOrientation parameter to
     18        CachedFont::platformDataFromCustomData().
     19
     20        * loader/cache/CachedFont.cpp:
     21        (WebCore::CachedFont::platformDataFromCustomData): Removed the TextOrientation parameter.
     22        * loader/cache/CachedFont.h:
     23
     24        * platform/graphics/FontCache.cpp:
     25        (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey): Removed the TextOrientation
     26        parameter and initializer.
     27        (WebCore::FontPlatformDataCacheKey::operator==): Updated for removal of m_textOrientation
     28        member variable.
     29        (FontPlatformDataCacheKey): Removed m_textOrientation member variable.
     30        (WebCore::computeHash): Removed text orientation bit from the hash.
     31        (WebCore::FontCache::getCachedFontPlatformData): Updated for FontPlatformDataCacheKey
     32        change.
     33
     34        * platform/graphics/FontPlatformData.cpp:
     35        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameters and
     36        initializers.
     37        (WebCore::FontPlatformData::operator=): Updated for removal of m_textOrientation
     38        member variable.
     39        * platform/graphics/FontPlatformData.h:
     40        (FontPlatformData): Removed m_textOrientation member variable, removed TextOrientation
     41        parameters from constructors.
     42        (WebCore::FontPlatformData::hash): Removed text orientation bit.
     43        (WebCore::FontPlatformData::operator==): Updated for removed member variable.
     44
     45        * platform/graphics/cairo/FontCustomPlatformData.h:
     46        (FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     47
     48        * platform/graphics/chromium/FontCacheAndroid.cpp:
     49        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
     50
     51        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     52        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
     53        initializer.
     54
     55        * platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
     56        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     57        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
     58        (WebCore::FontPlatformData::FontPlatformData): Removed TextOrientation parameter and
     59        initializers.
     60        (WebCore::FontPlatformData::operator=): Updated for removed member variable.
     61        (WebCore::FontPlatformData::operator==): Ditto.
     62        (WebCore::FontPlatformData::hash): Removed text orientation bit.
     63
     64        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:
     65        (FontPlatformData): Removed TextOrientation parameter from the constructor declaration.
     66
     67        * platform/graphics/mac/FontCacheMac.mm:
     68        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
     69
     70        * platform/graphics/mac/FontCustomPlatformData.cpp:
     71        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     72
     73        * platform/graphics/mac/FontCustomPlatformData.h:
     74        (FontCustomPlatformData): Removed TextOrientation parameter from declaration of
     75        fontPlatformData().
     76
     77        * platform/graphics/mac/SimpleFontDataMac.mm:
     78        (WebCore::SimpleFontData::getCompositeFontReferenceFontData): Updated for FontPlatformData
     79        change.
     80
     81        * platform/graphics/pango/FontCustomPlatformDataPango.cpp:
     82        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     83        * platform/graphics/qt/FontCustomPlatformData.h:
     84
     85        * platform/graphics/qt/FontCustomPlatformDataQt.cpp:
     86        (WebCore::FontCustomPlatformData::fontPlatformData): Ditto.
     87
     88        * platform/graphics/skia/FontCacheSkia.cpp:
     89        (WebCore::FontCache::createFontPlatformData): Updated for FontPlatformData change.
     90
     91        * platform/graphics/skia/FontCustomPlatformData.cpp:
     92        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     93        * platform/graphics/skia/FontCustomPlatformData.h:
     94
     95        * platform/graphics/win/FontCustomPlatformData.cpp:
     96        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     97        * platform/graphics/win/FontCustomPlatformData.h:
     98
     99        * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
     100        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     101        * platform/graphics/win/FontCustomPlatformDataCairo.h:
     102
     103        * platform/graphics/win/FontPlatformDataCGWin.cpp:
     104        (WebCore::FontPlatformData::FontPlatformData): Removed m_textOrientation initializer.
     105
     106        * platform/graphics/win/FontPlatformDataCairoWin.cpp:
     107        (WebCore::FontPlatformData::FontPlatformData): Ditto.
     108
     109        * platform/graphics/win/FontPlatformDataWin.cpp:
     110        (WebCore::FontPlatformData::FontPlatformData): Ditto.
     111
     112        * platform/graphics/wince/FontCustomPlatformData.cpp:
     113        (WebCore::FontCustomPlatformData::fontPlatformData): Removed TextOrientation parameter.
     114        * platform/graphics/wince/FontCustomPlatformData.h:
     115
    11162012-12-04  Charlie Reis  <creis@chromium.org>
    2117

  • trunk/Source/WebCore/WebCore.exp.in

    r136370 r136520  
    16321632__ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
    16331633__ZN7WebCore15GraphicsContextC1EP9CGContext
    1634 __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
    1635 __ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
     1634__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
     1635__ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
    16361636__ZN7WebCore16colorFromNSColorEP7NSColor
    16371637__ZN7WebCore16enclosingIntRectERK7_NSRect
    … …  
    19281928__ZN7WebCore15startOfDocumentERKNS_15VisiblePositionE
    19291929__ZN7WebCore15startOfSentenceERKNS_15VisiblePositionE
    1930 __ZN7WebCore16FontPlatformDataC1EP8__GSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
     1930__ZN7WebCore16FontPlatformDataC1EP8__GSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
    19311931__ZN7WebCore16ThreadGlobalData26sharedMainThreadStaticDataE
    19321932__ZN7WebCore16VisibleSelection27selectionFromContentsOfNodeEPNS_4NodeE

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

    r132969 r136520  
    112112
    113113    // See if we have a mapping in our FontData cache.
    114     unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 6 | fontDescription.widthVariant() << 4
    115                        | (fontDescription.textOrientation() == TextOrientationUpright ? 8 : 0) | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
     114    unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 5 | fontDescription.widthVariant() << 3
     115                       | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
    116116
    117117    RefPtr<SimpleFontData>& fontData = m_fontDataTable.add(hashKey, 0).iterator->value;
    … …  
    166166
    167167                fontData = SimpleFontData::create(m_font->platformDataFromCustomData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic,
    168                     fontDescription.orientation(), fontDescription.textOrientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false);
     168                    fontDescription.orientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false);
    169169            }
    170170        } else {

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

    r130983 r136520  
    116116}
    117117
    118 FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode renderingMode)
     118FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode renderingMode)
    119119{
    120120#if ENABLE(SVG_FONTS)
    … …  
    124124#ifdef STORE_FONT_CUSTOM_PLATFORM_DATA
    125125    ASSERT(m_fontData);
    126     return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, orientation, textOrientation, widthVariant, renderingMode);
     126    return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, orientation, widthVariant, renderingMode);
    127127#else
    128128    return FontPlatformData();

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

    r130983 r136520  
    3232#include "FontRenderingMode.h"
    3333#include "FontWidthVariant.h"
    34 #include "TextOrientation.h"
    3534
    3635namespace WebCore {
    … …  
    5756
    5857    bool ensureCustomFontData();
    59     FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
     58    FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    6059
    6160#if ENABLE(SVG_FONTS)

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

    r134871 r136520  
    6363    FontPlatformDataCacheKey(const AtomicString& family = AtomicString(), unsigned size = 0, unsigned weight = 0, bool italic = false,
    6464                             bool isPrinterFont = false, FontRenderingMode renderingMode = NormalRenderingMode, FontOrientation orientation = Horizontal,
    65                              TextOrientation textOrientation = TextOrientationVerticalRight, FontWidthVariant widthVariant = RegularWidth)
     65                             FontWidthVariant widthVariant = RegularWidth)
    6666        : m_size(size)
    6767        , m_weight(weight)
    … …  
    7171        , m_renderingMode(renderingMode)
    7272        , m_orientation(orientation)
    73         , m_textOrientation(textOrientation)
    7473        , m_widthVariant(widthVariant)
    7574    {
    … …  
    8382        return equalIgnoringCase(m_family, other.m_family) && m_size == other.m_size &&
    8483               m_weight == other.m_weight && m_italic == other.m_italic && m_printerFont == other.m_printerFont &&
    85                m_renderingMode == other.m_renderingMode && m_orientation == other.m_orientation && m_textOrientation == other.m_textOrientation && m_widthVariant == other.m_widthVariant;
     84               m_renderingMode == other.m_renderingMode && m_orientation == other.m_orientation && m_widthVariant == other.m_widthVariant;
    8685    }
    8786
    … …  
    9392    FontRenderingMode m_renderingMode;
    9493    FontOrientation m_orientation;
    95     TextOrientation m_textOrientation;
    9694    FontWidthVariant m_widthVariant;
    9795
    … …  
    107105        fontKey.m_weight,
    108106        fontKey.m_widthVariant,
    109         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)
     107        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)
    110108    };
    111109    return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
    … …  
    202200    FontPlatformDataCacheKey key(familyName, fontDescription.computedPixelSize(), fontDescription.weight(), fontDescription.italic(),
    203201                                 fontDescription.usePrinterFont(), fontDescription.renderingMode(), fontDescription.orientation(),
    204                                  fontDescription.textOrientation(), fontDescription.widthVariant());
     202                                 fontDescription.widthVariant());
    205203    FontPlatformData* result = 0;
    206204    bool foundResult;

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

    r127757 r136520  
    4040    , m_syntheticOblique(false)
    4141    , m_orientation(Horizontal)
    42     , m_textOrientation(TextOrientationVerticalRight)
    4342    , m_size(0)
    4443    , m_widthVariant(RegularWidth)
    … …  
    6867    , m_syntheticOblique(false)
    6968    , m_orientation(Horizontal)
    70     , m_textOrientation(TextOrientationVerticalRight)
    7169    , m_size(0)
    7270    , m_widthVariant(RegularWidth)
    … …  
    9088}
    9189
    92 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant)
     90FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
    9391    : m_syntheticBold(syntheticBold)
    9492    , m_syntheticOblique(syntheticOblique)
    9593    , m_orientation(orientation)
    96     , m_textOrientation(textOrientation)
    9794    , m_size(size)
    9895    , m_widthVariant(widthVariant)
    … …  
    117114
    118115#if OS(DARWIN) && (USE(CG) || USE(SKIA_ON_MAC_CHROMIUM))
    119 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    120                                    TextOrientation textOrientation, FontWidthVariant widthVariant)
     116FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
    121117    : m_syntheticBold(syntheticBold)
    122118    , m_syntheticOblique(syntheticOblique)
    123119    , m_orientation(orientation)
    124     , m_textOrientation(textOrientation)
    125120    , m_size(size)
    126121    , m_widthVariant(widthVariant)
    … …  
    138133    , m_syntheticOblique(source.m_syntheticOblique)
    139134    , m_orientation(source.m_orientation)
    140     , m_textOrientation(source.m_textOrientation)
    141135    , m_size(source.m_size)
    142136    , m_widthVariant(source.m_widthVariant)
    … …  
    159153    m_syntheticOblique = other.m_syntheticOblique;
    160154    m_orientation = other.m_orientation;
    161     m_textOrientation = other.m_textOrientation;
    162155    m_size = other.m_size;
    163156    m_widthVariant = other.m_widthVariant;

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

    r132925 r136520  
    4343#include "FontOrientation.h"
    4444#include "FontWidthVariant.h"
    45 #include "TextOrientation.h"
    4645
    4746#if PLATFORM(WIN)
    … …  
    107106    FontPlatformData(const FontPlatformData&);
    108107    FontPlatformData(const FontDescription&, const AtomicString& family);
    109     FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal,
    110                      TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
     108    FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
    111109
    112110#if OS(DARWIN)
    113111    FontPlatformData(NSFont*, float size, bool isPrinterFont = false, bool syntheticBold = false, bool syntheticOblique = false,
    114                      FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
    115 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
    116     FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation,
    117                      TextOrientation, FontWidthVariant);
     112                     FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
     113#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     114    FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);
    118115#endif
    119116#endif
    … …  
    161158#endif
    162159    FontOrientation orientation() const { return m_orientation; }
    163     TextOrientation textOrientation() const { return m_textOrientation; }
    164160    FontWidthVariant widthVariant() const { return m_widthVariant; }
    165161
    … …  
    182178        ASSERT(m_font || !m_cgFont);
    183179#endif
    184         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) };
     180        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) };
    185181        return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
    186182#elif USE(CAIRO)
    … …  
    203199#endif
    204200            && m_orientation == other.m_orientation
    205             && m_textOrientation == other.m_textOrientation
    206201            && m_widthVariant == other.m_widthVariant;
    207202    }
    … …  
    251246    bool m_syntheticOblique;
    252247    FontOrientation m_orientation;
    253     TextOrientation m_textOrientation;
    254248    float m_size;
    255249    FontWidthVariant m_widthVariant;

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

    r80582 r136520  
    2626#include "FontRenderingMode.h"
    2727#include "FontWidthVariant.h"
    28 #include "TextOrientation.h"
    2928#include <wtf/Forward.h>
    3029#include <wtf/Noncopyable.h>
    … …  
    4342    FontCustomPlatformData(FT_Face, SharedBuffer*);
    4443    ~FontCustomPlatformData();
    45     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
     44    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    4645    static bool supportsFormat(const String&);
    4746

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

    r133976 r136520  
    179179                                          (style & SkTypeface::kBold) && !typeface->isBold(),
    180180                                          (style & SkTypeface::kItalic) && !typeface->isItalic(),
    181                                           fontDescription.orientation(),
    182                                           fontDescription.textOrientation());
     181                                          fontDescription.orientation());
    183182    } else {
    184183        typeface = SkTypeface::CreateFromName(name, SkTypeface::kNormal);
    … …  
    204203                                          (style & SkTypeface::kBold) && !typeface->isBold(),
    205204                                          (style & SkTypeface::kItalic) && !typeface->isItalic(),
    206                                           fontDescription.orientation(),
    207                                           fontDescription.textOrientation());
     205                                          fontDescription.orientation());
    208206        }
    209207    }

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

    r127757 r136520  
    4646#endif  // PLATFORM(MAC)
    4747
    48 FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    49                                    TextOrientation textOrientation, FontWidthVariant widthVariant)
     48FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
    5049    : m_syntheticBold(syntheticBold)
    5150    , m_syntheticOblique(syntheticOblique)
    5251    , m_orientation(orientation)
    53     , m_textOrientation(textOrientation)
    5452    , m_size(size)
    5553    , m_widthVariant(widthVariant)

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

    r80582 r136520  
    6060}
    6161
    62 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
     62FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
    6363{
    6464    return FontPlatformData(m_fontFace, size, bold, italic);

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

    r134871 r136520  
    9898    , m_fakeItalic(false)
    9999    , m_orientation(Horizontal)
    100     , m_textOrientation(TextOrientationVerticalRight)
    101100{
    102101}
    … …  
    109108    , m_fakeItalic(false)
    110109    , m_orientation(Horizontal)
    111     , m_textOrientation(TextOrientationVerticalRight)
    112110{
    113111}
    … …  
    120118    , m_fakeItalic(fakeItalic)
    121119    , m_orientation(Horizontal)
    122     , m_textOrientation(TextOrientationVerticalRight)
    123120{
    124121}
    … …  
    132129    , m_fakeItalic(src.m_fakeItalic)
    133130    , m_orientation(src.m_orientation)
    134     , m_textOrientation(src.m_textOrientation)
    135131    , m_style(src.m_style)
    136132    , m_harfbuzzFace(src.m_harfbuzzFace)
    … …  
    139135}
    140136
    141 FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation, TextOrientation textOrientation)
     137FontPlatformData::FontPlatformData(SkTypeface* tf, const char* family, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation)
    142138    : m_typeface(tf)
    143139    , m_family(family)
    … …  
    147143    , m_fakeItalic(fakeItalic)
    148144    , m_orientation(orientation)
    149     , m_textOrientation(textOrientation)
    150145{
    151146    SkSafeRef(m_typeface);
    … …  
    161156    , m_fakeItalic(src.m_fakeItalic)
    162157    , m_orientation(src.m_orientation)
    163     , m_textOrientation(src.m_textOrientation)
    164158    , m_harfbuzzFace(src.m_harfbuzzFace)
    165159{
    … …  
    202196    m_harfbuzzFace = src.m_harfbuzzFace;
    203197    m_orientation = src.m_orientation;
    204     m_textOrientation = src.m_textOrientation;
    205198    m_style = src.m_style;
    206199    m_emSizeInFontUnits = src.m_emSizeInFontUnits;
    … …  
    257250        && m_fakeItalic == a.m_fakeItalic
    258251        && m_orientation == a.m_orientation
    259         && m_textOrientation == a.m_textOrientation
    260252        && m_style == a.m_style;
    261253}
    … …  
    264256{
    265257    unsigned h = SkTypeface::UniqueID(m_typeface);
    266     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));
     258    h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_fakeBold) << 1) | static_cast<int>(m_fakeItalic));
    267259
    268260    // This memcpy is to avoid a reinterpret_cast that breaks strict-aliasing

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

    r134871 r136520  
    3737#include "SharedBuffer.h"
    3838#include "SkPaint.h"
    39 #include "TextOrientation.h"
    4039#include <wtf/Forward.h>
    4140#include <wtf/RefPtr.h>
    … …  
    7271    FontPlatformData(float textSize, bool fakeBold, bool fakeItalic);
    7372    FontPlatformData(const FontPlatformData&);
    74     FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight);
     73    FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation = Horizontal);
    7574    FontPlatformData(const FontPlatformData& src, float textSize);
    7675    ~FontPlatformData();
    … …  
    145144    bool m_fakeItalic;
    146145    FontOrientation m_orientation;
    147     TextOrientation m_textOrientation;
    148146    FontRenderStyle m_style;
    149147#if USE(HARFBUZZ_NG)

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

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

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

    r122670 r136520  
    8989}
    9090
    91 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode)
     91FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode)
    9292{
    93     return FontPlatformData(m_cgFont, size, bold, italic, orientation, textOrientation, widthVariant);
     93    return FontPlatformData(m_cgFont, size, bold, italic, orientation, widthVariant);
    9494}
    9595

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

    r121582 r136520  
    2525#include "FontRenderingMode.h"
    2626#include "FontWidthVariant.h"
    27 #include "TextOrientation.h"
    2827#include <CoreFoundation/CFBase.h>
    2928#include <wtf/Forward.h>
    … …  
    5756    ~FontCustomPlatformData();
    5857
    59     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
     58    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    6059
    6160    static bool supportsFormat(const String&);

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

    r133362 r136520  
    128128            bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
    129129
    130             FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().textOrientation(), platformData().widthVariant());
     130            FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
    131131            SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont());
    132132            if (value) {

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

    r95901 r136520  
    3131}
    3232
    33 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
     33FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
    3434{
    3535    return FontPlatformData(m_fontFace, size, bold, italic);

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

    r129647 r136520  
    2626#include "FontRenderingMode.h"
    2727#include "FontWidthVariant.h"
    28 #include "TextOrientation.h"
    2928#include <QRawFont>
    3029#include <wtf/FastAllocBase.h>
    … …  
    4241    FontCustomPlatformData() { }
    4342
    44     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
     43    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
    4544                                      FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    4645

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

    r125766 r136520  
    2929namespace WebCore {
    3030
    31 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
     31FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode)
    3232{
    3333    Q_ASSERT(m_rawFont.isValid());

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

    r133976 r136520  
    181181                             (style & SkTypeface::kBold) && !tf->isBold(),
    182182                             (style & SkTypeface::kItalic) && !tf->isItalic(),
    183                              fontDescription.orientation(),
    184                              fontDescription.textOrientation());
     183                             fontDescription.orientation());
    185184    tf->unref();
    186185    return result;

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

    r126312 r136520  
    6767
    6868FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation orientation,
    69                                                           TextOrientation textOrientation, FontWidthVariant, FontRenderingMode mode)
     69                                                          FontWidthVariant, FontRenderingMode mode)
    7070{
    7171#if OS(WINDOWS)
    … …  
    104104#elif OS(UNIX)
    105105    ASSERT(m_fontReference);
    106     return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation, textOrientation);
     106    return FontPlatformData(m_fontReference, "", size, bold && !m_fontReference->isBold(), italic && !m_fontReference->isItalic(), orientation);
    107107#else
    108108    notImplemented();

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

    r127757 r136520  
    3636#include "FontRenderingMode.h"
    3737#include "FontWidthVariant.h"
    38 #include "TextOrientation.h"
    3938#include <wtf/Forward.h>
    4039#include <wtf/Noncopyable.h>
    … …  
    6867    ~FontCustomPlatformData();
    6968
    70     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
     69    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
    7170                                      FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    7271

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

    r122652 r136520  
    6060}
    6161
    62 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
     62FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode renderingMode)
    6363{
    6464    ASSERT(m_fontReference);

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

    r127757 r136520  
    2525#include "FontRenderingMode.h"
    2626#include "FontWidthVariant.h"
    27 #include "TextOrientation.h"
    2827#include <windows.h>
    2928#include <wtf/Forward.h>
    … …  
    4948    ~FontCustomPlatformData();
    5049
    51     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
     50    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal,
    5251                                      FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    5352

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

    r95901 r136520  
    3636}
    3737
    38 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant)
     38FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant)
    3939{
    4040    return FontPlatformData(m_fontFace, size, bold, italic);

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

    r95901 r136520  
    4343    ~FontCustomPlatformData();
    4444
    45     FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
     45    FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
    4646
    4747    static bool supportsFormat(const String&);

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

    r127757 r136520  
    119119    , m_syntheticOblique(oblique)
    120120    , m_orientation(Horizontal)
    121     , m_textOrientation(TextOrientationVerticalRight)
    122121    , m_size(size)
    123122    , m_widthVariant(RegularWidth)

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

    r127757 r136520  
    6161    , m_size(size)
    6262    , m_orientation(Horizontal)
    63     , m_textOrientation(TextOrientationVerticalRight)
    6463    , m_widthVariant(RegularWidth)
    6564    , m_scaledFont(0)

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

    r127757 r136520  
    4242    , m_size(size)
    4343    , m_orientation(Horizontal)
    44     , m_textOrientation(TextOrientationVerticalRight)
    4544    , m_widthVariant(RegularWidth)
    4645#if USE(CG)

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

    r122652 r136520  
    4646}
    4747
    48 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode renderingMode)
     48FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode renderingMode)
    4949{
    5050    FontDescription fontDesc;

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

    r127757 r136520  
    2525#include "FontRenderingMode.h"
    2626#include "FontWidthVariant.h"
    27 #include "TextOrientation.h"
    2827#include <wtf/Noncopyable.h>
    2928#include <wtf/text/WTFString.h>
    … …  
    5150        ~FontCustomPlatformData();
    5251
    53         FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
     52        FontPlatformData fontPlatformData(int size, bool bold, bool italic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
    5453
    5554        static bool supportsFormat(const String&);
Note: See TracChangeset for help on using the changeset viewer.