Changeset 120379 in webkit


Ignore:
Timestamp:
Jun 14, 2012 5:12:40 PM (12 years ago)
Author:
wangxianzhu@chromium.org
Message:

[Chromium] Add setAutoHint() and setUseBitmaps() in WebFontRendering
​https://bugs.webkit.org/show_bug.cgi?id=89014

Reviewed by James Robinson.

Source/WebCore:

No new tests because of no change of functionality.

  • platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:

(WebCore):
(WebCore::FontPlatformData::setAutoHint):
(WebCore::FontPlatformData::setUseBitmaps):
(WebCore::FontPlatformData::setAntiAlias):
(WebCore::FontPlatformData::setupPaint):

  • platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:

(FontPlatformData):

Source/WebKit/chromium:

  • public/linuxish/WebFontRendering.h:

(WebFontRendering):

  • src/linuxish/WebFontRendering.cpp:

(WebKit):
(WebKit::WebFontRendering::setAutoHint):
(WebKit::WebFontRendering::setUseBitmaps):
(WebKit::WebFontRendering::setAntiAlias):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r120369 r120379  
     12012-06-14  Xianzhu Wang  <wangxianzhu@chromium.org>
     2
     3        [Chromium] Add setAutoHint() and setUseBitmaps() in WebFontRendering
     4        https://bugs.webkit.org/show_bug.cgi?id=89014
     5
     6        Reviewed by James Robinson.
     7
     8        No new tests because of no change of functionality.
     9
     10        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
     11        (WebCore):
     12        (WebCore::FontPlatformData::setAutoHint):
     13        (WebCore::FontPlatformData::setUseBitmaps):
     14        (WebCore::FontPlatformData::setAntiAlias):
     15        (WebCore::FontPlatformData::setupPaint):
     16        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:
     17        (FontPlatformData):
     18
    1192012-06-14  Ryuan Choi  <ryuan.choi@samsung.com>
    220

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

    r119732 r120379  
    4646
    4747static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;
    48 static bool isSkiaAntiAlias = true;
     48static bool useSkiaAutoHint = true;
     49static bool useSkiaBitmaps = true;
     50static bool useSkiaAntiAlias = true;
    4951static bool useSkiaSubpixelRendering = false;
    5052static bool useSkiaSubpixelPositioning = false;
    … …  
    5557}
    5658
    57 void FontPlatformData::setAntiAlias(bool isAntiAlias)
    58 {
    59     isSkiaAntiAlias = isAntiAlias;
     59void FontPlatformData::setAutoHint(bool useAutoHint)
     60{
     61    useSkiaAutoHint = useAutoHint;
     62}
     63
     64void FontPlatformData::setUseBitmaps(bool useBitmaps)
     65{
     66    useSkiaBitmaps = useBitmaps;
     67}
     68
     69void FontPlatformData::setAntiAlias(bool useAntiAlias)
     70{
     71    useSkiaAntiAlias = useAntiAlias;
    6072}
    6173
    … …  
    166178    const float ts = m_textSize >= 0 ? m_textSize : 12;
    167179
    168     paint->setAntiAlias(m_style.useAntiAlias == FontRenderStyle::NoPreference ? isSkiaAntiAlias : m_style.useAntiAlias);
     180    paint->setAntiAlias(m_style.useAntiAlias == FontRenderStyle::NoPreference ? useSkiaAntiAlias : m_style.useAntiAlias);
    169181    switch (m_style.useHinting) {
    170182    case FontRenderStyle::NoPreference:
    … …  
    179191    }
    180192
    181     paint->setEmbeddedBitmapText(m_style.useBitmaps);
     193    paint->setEmbeddedBitmapText(m_style.useBitmaps == FontRenderStyle::NoPreference ? useSkiaBitmaps : m_style.useBitmaps);
    182194    paint->setTextSize(SkFloatToScalar(ts));
    183195    paint->setTypeface(m_typeface);
    184196    paint->setFakeBoldText(m_fakeBold);
    185197    paint->setTextSkewX(m_fakeItalic ? -SK_Scalar1 / 4 : 0);
    186     paint->setAutohinted(m_style.useAutoHint);
     198    paint->setAutohinted(m_style.useAutoHint == FontRenderStyle::NoPreference ? useSkiaAutoHint : m_style.useAutoHint);
    187199    paint->setSubpixelText(m_style.useSubpixelPositioning == FontRenderStyle::NoPreference ? useSkiaSubpixelPositioning : m_style.useSubpixelPositioning);
    188200
    189     if (m_style.useAntiAlias == 1 || (m_style.useAntiAlias == FontRenderStyle::NoPreference && isSkiaAntiAlias))
     201    if (m_style.useAntiAlias == 1 || (m_style.useAntiAlias == FontRenderStyle::NoPreference && useSkiaAntiAlias))
    190202        paint->setLCDRenderText(m_style.useSubpixelRendering == FontRenderStyle::NoPreference ? useSkiaSubpixelRendering : m_style.useSubpixelRendering);
    191203}

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

    r119732 r120379  
    135135
    136136    static void setHinting(SkPaint::Hinting);
     137    static void setAutoHint(bool);
     138    static void setUseBitmaps(bool);
    137139    static void setAntiAlias(bool);
    138140    static void setSubpixelRendering(bool);

  • trunk/Source/WebKit/chromium/ChangeLog

    r120363 r120379  
     12012-06-14  Xianzhu Wang  <wangxianzhu@chromium.org>
     2
     3        [Chromium] Add setAutoHint() and setUseBitmaps() in WebFontRendering
     4        https://bugs.webkit.org/show_bug.cgi?id=89014
     5
     6        Reviewed by James Robinson.
     7
     8        * public/linuxish/WebFontRendering.h:
     9        (WebFontRendering):
     10        * src/linuxish/WebFontRendering.cpp:
     11        (WebKit):
     12        (WebKit::WebFontRendering::setAutoHint):
     13        (WebKit::WebFontRendering::setUseBitmaps):
     14        (WebKit::WebFontRendering::setAntiAlias):
     15
    1162012-06-14  Daniel Erat  <derat@chromium.org>
    217

  • trunk/Source/WebKit/chromium/public/linuxish/WebFontRendering.h

    r120270 r120379  
    4343
    4444    WEBKIT_EXPORT static void setHinting(SkPaint::Hinting);
     45    WEBKIT_EXPORT static void setAutoHint(bool);
     46    WEBKIT_EXPORT static void setUseBitmaps(bool);
    4547    WEBKIT_EXPORT static void setAntiAlias(bool);
    46     WEBKIT_EXPORT static void setSubpixelGlyphs(bool); // DEPRECATED: use setSubpixelRendering instead
    4748    WEBKIT_EXPORT static void setSubpixelRendering(bool);
    4849    WEBKIT_EXPORT static void setSubpixelPositioning(bool);

  • trunk/Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp

    r120270 r120379  
    4545
    4646// static
    47 void WebFontRendering::setAntiAlias(bool isAntiAlias)
     47void WebFontRendering::setAutoHint(bool useAutoHint)
    4848{
    49     FontPlatformData::setAntiAlias(isAntiAlias);
     49    FontPlatformData::setAutoHint(useAutoHint);
    5050}
    5151
    5252// static
    53 void WebFontRendering::setSubpixelGlyphs(bool isSubpixelGlyphs)
     53void WebFontRendering::setUseBitmaps(bool useBitmaps)
    5454{
    55     FontPlatformData::setSubpixelRendering(isSubpixelGlyphs);
     55    FontPlatformData::setUseBitmaps(useBitmaps);
     56}
     57
     58// static
     59void WebFontRendering::setAntiAlias(bool useAntiAlias)
     60{
     61    FontPlatformData::setAntiAlias(useAntiAlias);
    5662}
    5763
Note: See TracChangeset for help on using the changeset viewer.