Changeset 86401 in webkit


Ignore:
Timestamp:
May 12, 2011 5:06:49 PM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-05-12 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Rename SimpleFontData::scaledFontData to createScaledFontData
​https://bugs.webkit.org/show_bug.cgi?id=60723

  • platform/graphics/SimpleFontData.h:
  • platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
  • platform/graphics/chromium/SimpleFontDataLinux.cpp:
  • platform/graphics/freetype/SimpleFontDataFreeType.cpp:
  • platform/graphics/haiku/SimpleFontDataHaiku.cpp:
  • platform/graphics/mac/SimpleFontDataMac.mm:
  • platform/graphics/pango/SimpleFontDataPango.cpp:
  • platform/graphics/qt/SimpleFontDataQt.cpp:
  • platform/graphics/win/SimpleFontDataWin.cpp:
  • platform/graphics/wince/SimpleFontDataWinCE.cpp:
  • platform/graphics/wx/SimpleFontDataWx.cpp:
Location:
trunk/Source/WebCore
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86400 r86401  
     12011-05-12  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Rename SimpleFontData::scaledFontData to createScaledFontData
     6        https://bugs.webkit.org/show_bug.cgi?id=60723
     7
     8        * platform/graphics/SimpleFontData.h:
     9        * platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
     10        * platform/graphics/chromium/SimpleFontDataLinux.cpp:
     11        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
     12        * platform/graphics/haiku/SimpleFontDataHaiku.cpp:
     13        * platform/graphics/mac/SimpleFontDataMac.mm:
     14        * platform/graphics/pango/SimpleFontDataPango.cpp:
     15        * platform/graphics/qt/SimpleFontDataQt.cpp:
     16        * platform/graphics/win/SimpleFontDataWin.cpp:
     17        * platform/graphics/wince/SimpleFontDataWinCE.cpp:
     18        * platform/graphics/wx/SimpleFontDataWx.cpp:
     19
    1202011-05-12  Levi Weintraub  <leviw@chromium.org>
    221

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

    r86375 r86401  
    194194    void commonInit();
    195195
    196     PassOwnPtr<SimpleFontData> scaledFontData(const FontDescription&, float scaleFactor) const;
     196    PassOwnPtr<SimpleFontData> createScaledFontData(const FontDescription&, float scaleFactor) const;
    197197
    198198#if (PLATFORM(WIN) && !OS(WINCE)) \

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

    r86375 r86401  
    113113}
    114114
    115 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     115PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    116116{
    117117    LOGFONT winFont;
    … …  
    128128        m_derivedFontData = DerivedFontData::create(isCustomFont());
    129129    if (!m_derivedFontData->smallCaps)
    130         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     130        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    131131
    132132    return m_derivedFontData->smallCaps.get();
    … …  
    138138        m_derivedFontData = DerivedFontData::create(isCustomFont());
    139139    if (!m_derivedFontData->emphasisMark)
    140         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     140        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    141141
    142142    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    156156}
    157157
    158 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     158PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    159159{
    160160    const float scaledSize = lroundf(fontDescription.computedSize() * scaleFactor);
    … …  
    167167        m_derivedFontData = DerivedFontData::create(isCustomFont());
    168168    if (!m_derivedFontData->smallCaps)
    169         m_derivedFontData->smallCaps = scaledFontData(fontDescription, smallCapsFraction);
     169        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, smallCapsFraction);
    170170
    171171    return m_derivedFontData->smallCaps.get();
    … …  
    177177        m_derivedFontData = DerivedFontData::create(isCustomFont());
    178178    if (!m_derivedFontData->emphasisMark)
    179         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, emphasisMarkFraction);
     179        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, emphasisMarkFraction);
    180180
    181181    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    8787}
    8888
    89 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     89PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    9090{
    9191    return adoptPtr(new SimpleFontData(FontPlatformData(cairo_scaled_font_get_font_face(m_platformData.scaledFont()),
    … …  
    100100    // FIXME: I think we want to ask FontConfig for the right font again.
    101101    if (!m_derivedFontData->smallCaps)
    102         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     102        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    103103
    104104    return m_derivedFontData->smallCaps.get();
    … …  
    110110        m_derivedFontData = DerivedFontData::create(isCustomFont());
    111111    if (!m_derivedFontData->emphasisMark)
    112         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     112        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    113113
    114114    return m_derivedFontData->emphasisMark.get();

  • trunk/Source/WebCore/platform/graphics/haiku/SimpleFontDataHaiku.cpp

    r86375 r86401  
    6767}
    6868
    69 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     69PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    7070{
    7171    FontDescription desc = FontDescription(fontDescription);
    … …  
    8080        m_derivedFontData = DerivedFontData::create(isCustomFont());
    8181    if (!m_derivedFontData->smallCaps)
    82         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     82        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    8383
    8484    return m_derivedFontData->smallCaps.get();
    … …  
    9090        m_derivedFontData = DerivedFontData::create(isCustomFont());
    9191    if (!m_derivedFontData->emphasisMark)
    92         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     92        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    9393
    9494    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    297297}
    298298
    299 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     299PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    300300{
    301301    if (isCustomFont()) {
    … …  
    339339        m_derivedFontData = DerivedFontData::create(isCustomFont());
    340340    if (!m_derivedFontData->smallCaps)
    341         m_derivedFontData->smallCaps = scaledFontData(fontDescription, smallCapsFontSizeMultiplier);
     341        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, smallCapsFontSizeMultiplier);
    342342
    343343    return m_derivedFontData->smallCaps.get();
    … …  
    349349        m_derivedFontData = DerivedFontData::create(isCustomFont());
    350350    if (!m_derivedFontData->emphasisMark)
    351         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5f);
     351        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5f);
    352352
    353353    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    8585}
    8686
    87 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     87PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    8888{
    8989    FontDescription desc = FontDescription(fontDescription);
    … …  
    9898        m_derivedFontData = DerivedFontData::create(isCustomFont());
    9999    if (!m_derivedFontData->smallCaps)
    100         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     100        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    101101
    102102    return m_derivedFontData->smallCaps.get();
    … …  
    108108        m_derivedFontData = DerivedFontData::create(isCustomFont());
    109109    if (!m_derivedFontData->emphasisMark)
    110         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     110        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    111111
    112112    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    7272}
    7373
    74 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     74PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    7575{
    7676    const float scaledSize = lroundf(fontDescription.computedSize() * scaleFactor);
    … …  
    8383        m_derivedFontData = DerivedFontData::create(isCustomFont());
    8484    if (!m_derivedFontData->smallCaps)
    85         m_derivedFontData->smallCaps = scaledFontData(fontDescription, smallCapsFraction);
     85        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, smallCapsFraction);
    8686
    8787    return m_derivedFontData->smallCaps.get();
    … …  
    9393        m_derivedFontData = DerivedFontData::create(isCustomFont());
    9494    if (!m_derivedFontData->emphasisMark)
    95         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, emphasisMarkFraction);
     95        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, emphasisMarkFraction);
    9696
    9797    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    109109}
    110110
    111 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     111PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    112112{
    113113    float scaledSize = scaleFactor * m_platformData.size();
    … …  
    130130        m_derivedFontData = DerivedFontData::create(isCustomFont());
    131131    if (!m_derivedFontData->smallCaps)
    132         m_derivedFontData->smallCaps = scaledFontData(fontDescription, cSmallCapsFontSizeMultiplier);
     132        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, cSmallCapsFontSizeMultiplier);
    133133
    134134    return m_derivedFontData->smallCaps.get();
    … …  
    140140        m_derivedFontData = DerivedFontData::create(isCustomFont());
    141141    if (!m_derivedFontData->emphasisMark)
    142         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     142        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    143143
    144144    return m_derivedFontData->emphasisMark.get();

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

    r86375 r86401  
    6464}
    6565
    66 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     66PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    6767{
    6868    FontDescription fontDesc(fontDescription);
    … …  
    8181        m_derivedFontData = DerivedFontData::create(isCustomFont());
    8282    if (!m_derivedFontData->smallCaps)
    83         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     83        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    8484
    8585    return m_derivedFontData->smallCaps.get();
    … …  
    9191        m_derivedFontData = DerivedFontData::create(isCustomFont());
    9292    if (!m_derivedFontData->emphasisMark)
    93         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     93        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    9494
    9595    return m_derivedFontData->emphasisMark.get();

  • trunk/Source/WebCore/platform/graphics/wx/SimpleFontDataWx.cpp

    r86375 r86401  
    9191}
    9292
    93 PassOwnPtr<SimpleFontData> SimpleFontData::scaledFontData(const FontDescription& fontDescription, float scaleFactor) const
     93PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    9494{
    9595    FontDescription desc = FontDescription(fontDescription);
    … …  
    104104        m_derivedFontData = DerivedFontData::create(isCustomFont());
    105105    if (!m_derivedFontData->smallCaps)
    106         m_derivedFontData->smallCaps = scaledFontData(fontDescription, .7);
     106        m_derivedFontData->smallCaps = createScaledFontData(fontDescription, .7);
    107107
    108108    return m_derivedFontData->smallCaps.get();
    … …  
    114114        m_derivedFontData = DerivedFontData::create(isCustomFont());
    115115    if (!m_derivedFontData->emphasisMark)
    116         m_derivedFontData->emphasisMark = scaledFontData(fontDescription, .5);
     116        m_derivedFontData->emphasisMark = createScaledFontData(fontDescription, .5);
    117117
    118118    return m_derivedFontData->emphasisMark.get();
Note: See TracChangeset for help on using the changeset viewer.