Changeset 141291 in webkit


Ignore:
Timestamp:
Jan 30, 2013 11:39:35 AM (11 years ago)
Author:
dominik.rottsches@intel.com
Message:

[HarfBuzz] Naming fixes after removing old HarfBuzz code
​https://bugs.webkit.org/show_bug.cgi?id=108170

Reviewed by Tony Chang.

Since the old harfbuzz code is gone in r141241, it makes sense to get rid
of the now unnecessray NG suffix in a number of places. While at it,
I am also fixing some naming inconsistencies.

Renamed all occurences of HarfBuzzNG* to HarfBuzz*,
renamed lowercase variants of harfbuzz* in variable and function names to camel-case harfBuzz*,
moved files in platform/graphics/harfbuzz/ng/* one level up and removed ng folder.
Updated corresponding entries in Chromium, GTK and EFL build system files.

No new tests, no change in behavior.

  • GNUmakefile.list.am:
  • PlatformEfl.cmake:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • platform/graphics/FontPlatformData.cpp:
  • platform/graphics/FontPlatformData.h:

(WebCore):
(FontPlatformData):

  • platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::platformDataInit):
(WebCore::FontPlatformData::platformDataAssign):
(WebCore::FontPlatformData::harfBuzzFace):

  • platform/graphics/freetype/FontPlatformData.h:

(FontPlatformData):

  • platform/graphics/freetype/FontPlatformDataFreeType.cpp:

(WebCore::FontPlatformData::operator=):
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::harfBuzzFace):

  • platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:

(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::operator=):
(WebCore::FontPlatformData::harfBuzzFace):

  • platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:

(WebCore):
(FontPlatformData):

  • platform/graphics/harfbuzz/HarfBuzzFace.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp.

(WebCore):
(FaceCacheEntry):
(WebCore::FaceCacheEntry::create):
(WebCore::FaceCacheEntry::~FaceCacheEntry):
(WebCore::FaceCacheEntry::face):
(WebCore::FaceCacheEntry::glyphCache):
(WebCore::FaceCacheEntry::FaceCacheEntry):
(WebCore::harfBuzzFaceCache):
(WebCore::HarfBuzzFace::HarfBuzzFace):
(WebCore::HarfBuzzFace::~HarfBuzzFace):
(WebCore::findScriptForVerticalGlyphSubstitution):
(WebCore::HarfBuzzFace::setScriptForVerticalGlyphSubstitution):

  • platform/graphics/harfbuzz/HarfBuzzFace.h: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.h.

(WebCore):
(HarfBuzzFace):
(WebCore::HarfBuzzFace::create):

  • platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp.

(WebCore):
(CairoFtFaceLocker):
(WebCore::CairoFtFaceLocker::CairoFtFaceLocker):
(WebCore::CairoFtFaceLocker::lock):
(WebCore::CairoFtFaceLocker::~CairoFtFaceLocker):
(WebCore::floatToHarfBuzzPosition):
(WebCore::doubleToHarfBuzzPosition):
(WebCore::CairoGetGlyphWidthAndExtents):
(WebCore::harfBuzzGetGlyph):
(WebCore::harfBuzzGetGlyphHorizontalAdvance):
(WebCore::harfBuzzGetGlyphHorizontalOrigin):
(WebCore::harfBuzzGetGlyphExtents):
(WebCore::harfBuzzCairoTextGetFontFuncs):
(WebCore::harfBuzzCairoGetTable):
(WebCore::HarfBuzzFace::createFace):
(WebCore::HarfBuzzFace::createFont):
(WebCore::HarfBuzzShaper::createGlyphBufferAdvance):

  • platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCoreText.cpp.

(WebCore):
(WebCore::floatToHarfBuzzPosition):
(WebCore::getGlyph):
(WebCore::getGlyphHorizontalAdvance):
(WebCore::getGlyphHorizontalOrigin):
(WebCore::getGlyphExtents):
(WebCore::harfbuzzCoreTextGetFontFuncs):
(WebCore::releaseTableData):
(WebCore::harfBuzzCoreTextGetTable):
(WebCore::HarfBuzzFace::createFace):
(WebCore::HarfBuzzFace::createFont):
(WebCore::HarfBuzzShaper::createGlyphBufferAdvance):

  • platform/graphics/harfbuzz/HarfBuzzFaceSkia.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp.

(WebCore):
(WebCore::HarfBuzzFontData::HarfBuzzFontData):
(HarfBuzzFontData):
(WebCore::SkiaScalarToHarfBuzzPosition):
(WebCore::SkiaGetGlyphWidthAndExtents):
(WebCore::harfBuzzGetGlyph):
(WebCore::harfBuzzGetGlyphHorizontalAdvance):
(WebCore::harfBuzzGetGlyphHorizontalOrigin):
(WebCore::harfBuzzGetGlyphExtents):
(WebCore::harfBuzzSkiaGetFontFuncs):
(WebCore::harfBuzzSkiaGetTable): Also fixed style checker whitespace complaint / indentation.
(WebCore::destroyHarfBuzzFontData):
(WebCore::HarfBuzzFace::createFace):
(WebCore::HarfBuzzFace::createFont):
(WebCore::HarfBuzzShaper::createGlyphBufferAdvance):

  • platform/graphics/harfbuzz/HarfBuzzShaper.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp.

(WebCore):
(HarfBuzzScopedPtr):
(WebCore::HarfBuzzScopedPtr::HarfBuzzScopedPtr):
(WebCore::HarfBuzzScopedPtr::~HarfBuzzScopedPtr):
(WebCore::HarfBuzzScopedPtr::get):
(WebCore::harfBuzzPositionToFloat):
(WebCore::HarfBuzzShaper::HarfBuzzRun::HarfBuzzRun):
(WebCore::HarfBuzzShaper::HarfBuzzRun::applyShapeResult):
(WebCore::HarfBuzzShaper::HarfBuzzRun::setGlyphAndPositions):
(WebCore::HarfBuzzShaper::HarfBuzzRun::characterIndexForXPosition):
(WebCore::HarfBuzzShaper::HarfBuzzRun::xPositionForOffset):
(WebCore::normalizeCharacters):
(WebCore::HarfBuzzShaper::HarfBuzzShaper):
(WebCore::HarfBuzzShaper::~HarfBuzzShaper):
(WebCore::HarfBuzzShaper::setDrawRange):
(WebCore::HarfBuzzShaper::setFontFeatures):
(WebCore::HarfBuzzShaper::shape):
(WebCore::HarfBuzzShaper::adjustStartPoint):
(WebCore::HarfBuzzShaper::collectHarfBuzzRuns):
(WebCore::HarfBuzzShaper::shapeHarfBuzzRuns):
(WebCore::HarfBuzzShaper::setGlyphPositionsForHarfBuzzRun):
(WebCore::HarfBuzzShaper::fillGlyphBufferFromHarfBuzzRun):
(WebCore::HarfBuzzShaper::fillGlyphBuffer):
(WebCore::HarfBuzzShaper::offsetForPosition):
(WebCore::HarfBuzzShaper::selectionRect):

  • platform/graphics/harfbuzz/HarfBuzzShaper.h: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h.

(WebCore):
(HarfBuzzShaper):
(WebCore::HarfBuzzShaper::totalWidth):
(HarfBuzzRun):
(WebCore::HarfBuzzShaper::HarfBuzzRun::create):
(WebCore::HarfBuzzShaper::HarfBuzzRun::setWidth):
(WebCore::HarfBuzzShaper::HarfBuzzRun::fontData):
(WebCore::HarfBuzzShaper::HarfBuzzRun::startIndex):
(WebCore::HarfBuzzShaper::HarfBuzzRun::numCharacters):
(WebCore::HarfBuzzShaper::HarfBuzzRun::numGlyphs):
(WebCore::HarfBuzzShaper::HarfBuzzRun::glyphs):
(WebCore::HarfBuzzShaper::HarfBuzzRun::advances):
(WebCore::HarfBuzzShaper::HarfBuzzRun::offsets):
(WebCore::HarfBuzzShaper::HarfBuzzRun::glyphToCharacterIndexes):
(WebCore::HarfBuzzShaper::HarfBuzzRun::width):
(WebCore::HarfBuzzShaper::HarfBuzzRun::rtl):
(WebCore::HarfBuzzShaper::HarfBuzzRun::script):

Location:
trunk/Source/WebCore
Files:
12 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r141290 r141291  
     12013-01-30  Dominik Röttsches  <dominik.rottsches@intel.com>
     2
     3        [HarfBuzz] Naming fixes after removing old HarfBuzz code
     4        https://bugs.webkit.org/show_bug.cgi?id=108170
     5
     6        Reviewed by Tony Chang.
     7
     8        Since the old harfbuzz code is gone in r141241, it makes sense to get rid
     9        of the now unnecessray NG suffix in a number of places. While at it,
     10        I am also fixing some naming inconsistencies.
     11
     12        Renamed all occurences of HarfBuzzNG* to HarfBuzz*,
     13        renamed lowercase variants of harfbuzz* in variable and function names to camel-case harfBuzz*,
     14        moved files in platform/graphics/harfbuzz/ng/* one level up and removed ng folder.
     15        Updated corresponding entries in Chromium, GTK and EFL build system files.
     16
     17        No new tests, no change in behavior.
     18
     19        * GNUmakefile.list.am:
     20        * PlatformEfl.cmake:
     21        * WebCore.gyp/WebCore.gyp:
     22        * WebCore.gypi:
     23        * platform/graphics/FontPlatformData.cpp:
     24        * platform/graphics/FontPlatformData.h:
     25        (WebCore):
     26        (FontPlatformData):
     27        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     28        (WebCore::FontPlatformData::platformDataInit):
     29        (WebCore::FontPlatformData::platformDataAssign):
     30        (WebCore::FontPlatformData::harfBuzzFace):
     31        * platform/graphics/freetype/FontPlatformData.h:
     32        (FontPlatformData):
     33        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
     34        (WebCore::FontPlatformData::operator=):
     35        (WebCore::FontPlatformData::FontPlatformData):
     36        (WebCore::FontPlatformData::harfBuzzFace):
     37        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
     38        (WebCore::FontPlatformData::FontPlatformData):
     39        (WebCore::FontPlatformData::operator=):
     40        (WebCore::FontPlatformData::harfBuzzFace):
     41        * platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:
     42        (WebCore):
     43        (FontPlatformData):
     44        * platform/graphics/harfbuzz/HarfBuzzFace.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp.
     45        (WebCore):
     46        (FaceCacheEntry):
     47        (WebCore::FaceCacheEntry::create):
     48        (WebCore::FaceCacheEntry::~FaceCacheEntry):
     49        (WebCore::FaceCacheEntry::face):
     50        (WebCore::FaceCacheEntry::glyphCache):
     51        (WebCore::FaceCacheEntry::FaceCacheEntry):
     52        (WebCore::harfBuzzFaceCache):
     53        (WebCore::HarfBuzzFace::HarfBuzzFace):
     54        (WebCore::HarfBuzzFace::~HarfBuzzFace):
     55        (WebCore::findScriptForVerticalGlyphSubstitution):
     56        (WebCore::HarfBuzzFace::setScriptForVerticalGlyphSubstitution):
     57        * platform/graphics/harfbuzz/HarfBuzzFace.h: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.h.
     58        (WebCore):
     59        (HarfBuzzFace):
     60        (WebCore::HarfBuzzFace::create):
     61        * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp.
     62        (WebCore):
     63        (CairoFtFaceLocker):
     64        (WebCore::CairoFtFaceLocker::CairoFtFaceLocker):
     65        (WebCore::CairoFtFaceLocker::lock):
     66        (WebCore::CairoFtFaceLocker::~CairoFtFaceLocker):
     67        (WebCore::floatToHarfBuzzPosition):
     68        (WebCore::doubleToHarfBuzzPosition):
     69        (WebCore::CairoGetGlyphWidthAndExtents):
     70        (WebCore::harfBuzzGetGlyph):
     71        (WebCore::harfBuzzGetGlyphHorizontalAdvance):
     72        (WebCore::harfBuzzGetGlyphHorizontalOrigin):
     73        (WebCore::harfBuzzGetGlyphExtents):
     74        (WebCore::harfBuzzCairoTextGetFontFuncs):
     75        (WebCore::harfBuzzCairoGetTable):
     76        (WebCore::HarfBuzzFace::createFace):
     77        (WebCore::HarfBuzzFace::createFont):
     78        (WebCore::HarfBuzzShaper::createGlyphBufferAdvance):
     79        * platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCoreText.cpp.
     80        (WebCore):
     81        (WebCore::floatToHarfBuzzPosition):
     82        (WebCore::getGlyph):
     83        (WebCore::getGlyphHorizontalAdvance):
     84        (WebCore::getGlyphHorizontalOrigin):
     85        (WebCore::getGlyphExtents):
     86        (WebCore::harfbuzzCoreTextGetFontFuncs):
     87        (WebCore::releaseTableData):
     88        (WebCore::harfBuzzCoreTextGetTable):
     89        (WebCore::HarfBuzzFace::createFace):
     90        (WebCore::HarfBuzzFace::createFont):
     91        (WebCore::HarfBuzzShaper::createGlyphBufferAdvance):
     92        * platform/graphics/harfbuzz/HarfBuzzFaceSkia.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp.
     93        (WebCore):
     94        (WebCore::HarfBuzzFontData::HarfBuzzFontData):
     95        (HarfBuzzFontData):
     96        (WebCore::SkiaScalarToHarfBuzzPosition):
     97        (WebCore::SkiaGetGlyphWidthAndExtents):
     98        (WebCore::harfBuzzGetGlyph):
     99        (WebCore::harfBuzzGetGlyphHorizontalAdvance):
     100        (WebCore::harfBuzzGetGlyphHorizontalOrigin):
     101        (WebCore::harfBuzzGetGlyphExtents):
     102        (WebCore::harfBuzzSkiaGetFontFuncs):
     103        (WebCore::harfBuzzSkiaGetTable): Also fixed style checker whitespace complaint / indentation.
     104        (WebCore::destroyHarfBuzzFontData):
     105        (WebCore::HarfBuzzFace::createFace):
     106        (WebCore::HarfBuzzFace::createFont):
     107        (WebCore::HarfBuzzShaper::createGlyphBufferAdvance):
     108        * platform/graphics/harfbuzz/HarfBuzzShaper.cpp: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp.
     109        (WebCore):
     110        (HarfBuzzScopedPtr):
     111        (WebCore::HarfBuzzScopedPtr::HarfBuzzScopedPtr):
     112        (WebCore::HarfBuzzScopedPtr::~HarfBuzzScopedPtr):
     113        (WebCore::HarfBuzzScopedPtr::get):
     114        (WebCore::harfBuzzPositionToFloat):
     115        (WebCore::HarfBuzzShaper::HarfBuzzRun::HarfBuzzRun):
     116        (WebCore::HarfBuzzShaper::HarfBuzzRun::applyShapeResult):
     117        (WebCore::HarfBuzzShaper::HarfBuzzRun::setGlyphAndPositions):
     118        (WebCore::HarfBuzzShaper::HarfBuzzRun::characterIndexForXPosition):
     119        (WebCore::HarfBuzzShaper::HarfBuzzRun::xPositionForOffset):
     120        (WebCore::normalizeCharacters):
     121        (WebCore::HarfBuzzShaper::HarfBuzzShaper):
     122        (WebCore::HarfBuzzShaper::~HarfBuzzShaper):
     123        (WebCore::HarfBuzzShaper::setDrawRange):
     124        (WebCore::HarfBuzzShaper::setFontFeatures):
     125        (WebCore::HarfBuzzShaper::shape):
     126        (WebCore::HarfBuzzShaper::adjustStartPoint):
     127        (WebCore::HarfBuzzShaper::collectHarfBuzzRuns):
     128        (WebCore::HarfBuzzShaper::shapeHarfBuzzRuns):
     129        (WebCore::HarfBuzzShaper::setGlyphPositionsForHarfBuzzRun):
     130        (WebCore::HarfBuzzShaper::fillGlyphBufferFromHarfBuzzRun):
     131        (WebCore::HarfBuzzShaper::fillGlyphBuffer):
     132        (WebCore::HarfBuzzShaper::offsetForPosition):
     133        (WebCore::HarfBuzzShaper::selectionRect):
     134        * platform/graphics/harfbuzz/HarfBuzzShaper.h: Renamed from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h.
     135        (WebCore):
     136        (HarfBuzzShaper):
     137        (WebCore::HarfBuzzShaper::totalWidth):
     138        (HarfBuzzRun):
     139        (WebCore::HarfBuzzShaper::HarfBuzzRun::create):
     140        (WebCore::HarfBuzzShaper::HarfBuzzRun::setWidth):
     141        (WebCore::HarfBuzzShaper::HarfBuzzRun::fontData):
     142        (WebCore::HarfBuzzShaper::HarfBuzzRun::startIndex):
     143        (WebCore::HarfBuzzShaper::HarfBuzzRun::numCharacters):
     144        (WebCore::HarfBuzzShaper::HarfBuzzRun::numGlyphs):
     145        (WebCore::HarfBuzzShaper::HarfBuzzRun::glyphs):
     146        (WebCore::HarfBuzzShaper::HarfBuzzRun::advances):
     147        (WebCore::HarfBuzzShaper::HarfBuzzRun::offsets):
     148        (WebCore::HarfBuzzShaper::HarfBuzzRun::glyphToCharacterIndexes):
     149        (WebCore::HarfBuzzShaper::HarfBuzzRun::width):
     150        (WebCore::HarfBuzzShaper::HarfBuzzRun::rtl):
     151        (WebCore::HarfBuzzShaper::HarfBuzzRun::script):
     152
    11532013-01-30  Tony Chang  <tony@chromium.org>
    2154

  • trunk/Source/WebCore/GNUmakefile.list.am

    r141265 r141291  
    42394239        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp \
    42404240        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaperBase.h \
    4241         Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp \
    4242         Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFace.h \
    4243         Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp \
    4244         Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp \
    4245         Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h \
     4241        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.cpp \
     4242        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFace.h \
     4243        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp \
     4244        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp \
     4245        Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.h \
    42464246        Source/WebCore/plugins/npapi.h \
    42474247        Source/WebCore/plugins/npruntime.h \

  • trunk/Source/WebCore/PlatformEfl.cmake

    r140518 r141291  
    128128
    129129    platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp
    130     platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp
    131     platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp
    132     platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
     130    platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
     131    platform/graphics/harfbuzz/HarfBuzzFace.cpp
     132    platform/graphics/harfbuzz/HarfBuzzShaper.cpp
    133133
    134134    platform/graphics/surfaces/glx/GLXContext.cpp

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r141007 r141291  
    17161716            ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
    17171717            ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
     1718            ['include', 'platform/graphics/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
     1719            ['include', 'platform/graphics/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
     1720            ['include', 'platform/graphics/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
    17181721            ['include', 'platform/graphics/harfbuzz/HarfBuzzShaperBase\\.(cpp|h)$'],
    1719             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzNGFace\\.(cpp|h)$'],
    1720             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia\\.cpp$'],
    1721             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzShaper\\.(cpp|h)$'],
    17221722            ['include', 'platform/graphics/opentype/OpenTypeTypes\\.h$'],
    17231723            ['include', 'platform/graphics/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
    … …  
    18571857            ['exclude', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
    18581858
    1859             # Mac uses Harfbuzz-ng.
     1859            # Mac uses Harfbuzz.
     1860            ['include', 'platform/graphics/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
     1861            ['include', 'platform/graphics/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
     1862            ['include', 'platform/graphics/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
    18601863            ['include', 'platform/graphics/harfbuzz/HarfBuzzShaperBase\\.(cpp|h)$'],
    1861             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCoreText\\.cpp$'],
    1862             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzNGFace\\.(cpp|h)$'],
    1863             ['include', 'platform/graphics/harfbuzz/ng/HarfBuzzShaper\\.(cpp|h)$'],
    18641864          ],
    18651865        },{ # OS!="mac"

  • trunk/Source/WebCore/WebCore.gypi

    r141272 r141291  
    40444044            'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp',
    40454045            'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h',
     4046            'platform/graphics/harfbuzz/HarfBuzzFaceCoreText.cpp',
     4047            'platform/graphics/harfbuzz/HarfBuzzFaceSkia.cpp',
     4048            'platform/graphics/harfbuzz/HarfBuzzFace.cpp',
     4049            'platform/graphics/harfbuzz/HarfBuzzFace.h',
     4050            'platform/graphics/harfbuzz/HarfBuzzShaper.cpp',
     4051            'platform/graphics/harfbuzz/HarfBuzzShaper.h',
    40464052            'platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp',
    40474053            'platform/graphics/harfbuzz/HarfBuzzShaperBase.h',
    4048             'platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCoreText.cpp',
    4049             'platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp',
    4050             'platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp',
    4051             'platform/graphics/harfbuzz/ng/HarfBuzzNGFace.h',
    4052             'platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp',
    4053             'platform/graphics/harfbuzz/ng/HarfBuzzShaper.h',
    40544054            'platform/graphics/mac/ColorMac.mm',
    40554055            'platform/graphics/mac/ComplexTextController.cpp',

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

    r136520 r141291  
    2929
    3030#if PLATFORM(CHROMIUM) && OS(DARWIN)
    31 #include "HarfBuzzNGFace.h"
     31#include "HarfBuzzFace.h"
    3232#endif
    3333

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

    r137263 r141291  
    9191
    9292#if PLATFORM(CHROMIUM) && OS(DARWIN)
    93 class HarfBuzzNGFace;
     93class HarfBuzzFace;
    9494#endif
    9595
    … …  
    165165
    166166#if PLATFORM(CHROMIUM) && OS(DARWIN)
    167     HarfBuzzNGFace* harfbuzzFace();
     167    HarfBuzzFace* harfBuzzFace();
    168168#endif
    169169
    … …  
    269269#if PLATFORM(CHROMIUM) && OS(DARWIN)
    270270    RefPtr<MemoryActivatedFont> m_inMemoryFont;
    271     RefPtr<HarfBuzzNGFace> m_harfbuzzFace;
     271    RefPtr<HarfBuzzFace> m_harfBuzzFace;
    272272#endif
    273273

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

    r136520 r141291  
    3030
    3131#if PLATFORM(CHROMIUM) && OS(DARWIN)
    32 #import "HarfBuzzNGFace.h"
     32#import "HarfBuzzFace.h"
    3333#endif
    3434
    … …  
    9595#if PLATFORM(CHROMIUM) && OS(DARWIN)
    9696    m_inMemoryFont = f.m_inMemoryFont;
    97     m_harfbuzzFace = f.m_harfbuzzFace;
     97    m_harfBuzzFace = f.m_harfBuzzFace;
    9898#endif
    9999}
    … …  
    112112#if PLATFORM(CHROMIUM) && OS(DARWIN)
    113113    m_inMemoryFont = f.m_inMemoryFont;
    114     m_harfbuzzFace = f.m_harfbuzzFace;
     114    m_harfBuzzFace = f.m_harfBuzzFace;
    115115#endif
    116116    return *this;
    … …  
    310310}
    311311
    312 HarfBuzzNGFace* FontPlatformData::harfbuzzFace()
     312HarfBuzzFace* FontPlatformData::harfBuzzFace()
    313313{
    314314    CTFontRef font = ctFont();
    … …  
    317317        return 0;
    318318
    319     if (!m_harfbuzzFace) {
     319    if (!m_harfBuzzFace) {
    320320        uint64_t uniqueID = reinterpret_cast<uintptr_t>(font);
    321         m_harfbuzzFace = HarfBuzzNGFace::create(const_cast<FontPlatformData*>(this), uniqueID);
    322     }
    323     return m_harfbuzzFace.get();
     321        m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID);
     322    }
     323    return m_harfBuzzFace.get();
    324324}
    325325#endif

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

    r141241 r141291  
    3030#include "FontOrientation.h"
    3131#include "GlyphBuffer.h"
    32 #include "HarfBuzzNGFace.h"
     32#include "HarfBuzzFace.h"
    3333#include "RefPtrCairo.h"
    3434#include <wtf/Forward.h>
    … …  
    3636
    3737typedef struct _FcFontSet FcFontSet;
    38 class HarfBuzzNGFace;
     38class HarfBuzzFace;
    3939
    4040namespace WebCore {
    … …  
    6666    ~FontPlatformData();
    6767
    68     HarfBuzzNGFace* harfbuzzFace() const;
     68    HarfBuzzFace* harfBuzzFace() const;
    6969
    7070    bool isFixedPitch();
    … …  
    103103    bool m_fixedWidth;
    104104    cairo_scaled_font_t* m_scaledFont;
    105     mutable RefPtr<HarfBuzzNGFace> m_harfbuzzFace;
     105    mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
    106106
    107107private:

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

    r141241 r141291  
    192192    m_scaledFont = cairo_scaled_font_reference(other.m_scaledFont);
    193193
    194     m_harfbuzzFace = other.m_harfbuzzFace;
     194    m_harfBuzzFace = other.m_harfBuzzFace;
    195195
    196196    return *this;
    … …  
    200200    : m_fallbacks(0)
    201201    , m_scaledFont(0)
    202     , m_harfbuzzFace(other.m_harfbuzzFace)
     202    , m_harfBuzzFace(other.m_harfBuzzFace)
    203203{
    204204    *this = other;
    … …  
    206206
    207207FontPlatformData::FontPlatformData(const FontPlatformData& other, float size)
    208     : m_harfbuzzFace(other.m_harfbuzzFace)
     208    : m_harfBuzzFace(other.m_harfBuzzFace)
    209209{
    210210    *this = other;
    … …  
    227227}
    228228
    229 HarfBuzzNGFace* FontPlatformData::harfbuzzFace() const
    230 {
    231     if (!m_harfbuzzFace)
    232         m_harfbuzzFace = HarfBuzzNGFace::create(const_cast<FontPlatformData*>(this), hash());
    233 
    234     return m_harfbuzzFace.get();
     229HarfBuzzFace* FontPlatformData::harfBuzzFace() const
     230{
     231    if (!m_harfBuzzFace)
     232        m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), hash());
     233
     234    return m_harfBuzzFace.get();
    235235}
    236236

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

    r141241 r141291  
    3333
    3434#include "FontCache.h"
    35 #include "HarfBuzzNGFace.h"
     35#include "HarfBuzzFace.h"
    3636#include "NotImplemented.h"
    3737#include "SkAdvancedTypefaceMetrics.h"
    … …  
    125125    , m_orientation(src.m_orientation)
    126126    , m_style(src.m_style)
    127     , m_harfbuzzFace(src.m_harfbuzzFace)
     127    , m_harfBuzzFace(src.m_harfBuzzFace)
    128128{
    129129    SkSafeRef(m_typeface);
    … …  
    151151    , m_fakeItalic(src.m_fakeItalic)
    152152    , m_orientation(src.m_orientation)
    153     , m_harfbuzzFace(src.m_harfbuzzFace)
     153    , m_harfBuzzFace(src.m_harfBuzzFace)
    154154{
    155155    SkSafeRef(m_typeface);
    … …  
    189189    m_fakeBold = src.m_fakeBold;
    190190    m_fakeItalic = src.m_fakeItalic;
    191     m_harfbuzzFace = src.m_harfbuzzFace;
     191    m_harfBuzzFace = src.m_harfBuzzFace;
    192192    m_orientation = src.m_orientation;
    193193    m_style = src.m_style;
    … …  
    269269}
    270270
    271 HarfBuzzNGFace* FontPlatformData::harfbuzzFace() const
    272 {
    273     if (!m_harfbuzzFace)
    274         m_harfbuzzFace = HarfBuzzNGFace::create(const_cast<FontPlatformData*>(this), uniqueID());
    275 
    276     return m_harfbuzzFace.get();
     271HarfBuzzFace* FontPlatformData::harfBuzzFace() const
     272{
     273    if (!m_harfBuzzFace)
     274        m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
     275
     276    return m_harfBuzzFace.get();
    277277}
    278278

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

    r141241 r141291  
    4848
    4949class FontDescription;
    50 class HarfBuzzNGFace;
     50class HarfBuzzFace;
    5151
    5252// -----------------------------------------------------------------------------
    … …  
    108108#endif
    109109
    110     HarfBuzzNGFace* harfbuzzFace() const;
     110    HarfBuzzFace* harfBuzzFace() const;
    111111
    112112    // The returned styles are all actual styles without FontRenderStyle::NoPreference.
    … …  
    136136    FontOrientation m_orientation;
    137137    FontRenderStyle m_style;
    138     mutable RefPtr<HarfBuzzNGFace> m_harfbuzzFace;
     138    mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
    139139
    140140    SkTypeface* hashTableDeletedFontValue() const { return reinterpret_cast<SkTypeface*>(-1); }

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

    r141290 r141291  
    3030
    3131#include "config.h"
    32 #include "HarfBuzzNGFace.h"
     32#include "HarfBuzzFace.h"
    3333
    3434#include "FontPlatformData.h"
    … …  
    3838namespace WebCore {
    3939
    40 const hb_tag_t HarfBuzzNGFace::vertTag = HB_TAG('v', 'e', 'r', 't');
    41 const hb_tag_t HarfBuzzNGFace::vrt2Tag = HB_TAG('v', 'r', 't', '2');
     40const hb_tag_t HarfBuzzFace::vertTag = HB_TAG('v', 'e', 'r', 't');
     41const hb_tag_t HarfBuzzFace::vrt2Tag = HB_TAG('v', 'r', 't', '2');
    4242
    4343// Though we have FontCache class, which provides the cache mechanism for
    … …  
    7070};
    7171
    72 typedef HashMap<uint64_t, RefPtr<FaceCacheEntry>, WTF::IntHash<uint64_t>, WTF::UnsignedWithZeroKeyHashTraits<uint64_t> > HarfBuzzNGFaceCache;
     72typedef HashMap<uint64_t, RefPtr<FaceCacheEntry>, WTF::IntHash<uint64_t>, WTF::UnsignedWithZeroKeyHashTraits<uint64_t> > HarfBuzzFaceCache;
    7373
    74 static HarfBuzzNGFaceCache* harfbuzzFaceCache()
     74static HarfBuzzFaceCache* harfBuzzFaceCache()
    7575{
    76     DEFINE_STATIC_LOCAL(HarfBuzzNGFaceCache, s_harfbuzzFaceCache, ());
    77     return &s_harfbuzzFaceCache;
     76    DEFINE_STATIC_LOCAL(HarfBuzzFaceCache, s_harfBuzzFaceCache, ());
     77    return &s_harfBuzzFaceCache;
    7878}
    7979
    80 HarfBuzzNGFace::HarfBuzzNGFace(FontPlatformData* platformData, uint64_t uniqueID)
     80HarfBuzzFace::HarfBuzzFace(FontPlatformData* platformData, uint64_t uniqueID)
    8181    : m_platformData(platformData)
    8282    , m_uniqueID(uniqueID)
    8383    , m_scriptForVerticalText(HB_SCRIPT_INVALID)
    8484{
    85     HarfBuzzNGFaceCache::AddResult result = harfbuzzFaceCache()->add(m_uniqueID, 0);
     85    HarfBuzzFaceCache::AddResult result = harfBuzzFaceCache()->add(m_uniqueID, 0);
    8686    if (result.isNewEntry)
    8787        result.iterator->value = FaceCacheEntry::create(createFace());
    … …  
    9191}
    9292
    93 HarfBuzzNGFace::~HarfBuzzNGFace()
     93HarfBuzzFace::~HarfBuzzFace()
    9494{
    95     HarfBuzzNGFaceCache::iterator result = harfbuzzFaceCache()->find(m_uniqueID);
    96     ASSERT(result != harfbuzzFaceCache()->end());
     95    HarfBuzzFaceCache::iterator result = harfBuzzFaceCache()->find(m_uniqueID);
     96    ASSERT(result != harfBuzzFaceCache()->end());
    9797    ASSERT(result.get()->value->refCount() > 1);
    9898    result.get()->value->deref();
    9999    if (result.get()->value->refCount() == 1)
    100         harfbuzzFaceCache()->remove(m_uniqueID);
     100        harfBuzzFaceCache()->remove(m_uniqueID);
    101101}
    102102
    … …  
    114114        for (unsigned languageIndex = 0; languageIndex < languageCount; ++languageIndex) {
    115115            unsigned featureIndex;
    116             if (hb_ot_layout_language_find_feature(face, HB_OT_TAG_GSUB, scriptIndex, languageIndex, HarfBuzzNGFace::vertTag, &featureIndex)
    117                 || hb_ot_layout_language_find_feature(face, HB_OT_TAG_GSUB, scriptIndex, languageIndex, HarfBuzzNGFace::vrt2Tag, &featureIndex))
     116            if (hb_ot_layout_language_find_feature(face, HB_OT_TAG_GSUB, scriptIndex, languageIndex, HarfBuzzFace::vertTag, &featureIndex)
     117                || hb_ot_layout_language_find_feature(face, HB_OT_TAG_GSUB, scriptIndex, languageIndex, HarfBuzzFace::vrt2Tag, &featureIndex))
    118118                return hb_ot_tag_to_script(scriptTags[scriptIndex]);
    119119        }
    … …  
    122122}
    123123
    124 void HarfBuzzNGFace::setScriptForVerticalGlyphSubstitution(hb_buffer_t* buffer)
     124void HarfBuzzFace::setScriptForVerticalGlyphSubstitution(hb_buffer_t* buffer)
    125125{
    126126    if (m_scriptForVerticalText == HB_SCRIPT_INVALID)

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

    r141290 r141291  
    2929 */
    3030
    31 #ifndef HarfBuzzNGFace_h
    32 #define HarfBuzzNGFace_h
     31#ifndef HarfBuzzFace_h
     32#define HarfBuzzFace_h
    3333
    3434#include <hb.h>
    … …  
    4343class FontPlatformData;
    4444
    45 class HarfBuzzNGFace : public RefCounted<HarfBuzzNGFace> {
     45class HarfBuzzFace : public RefCounted<HarfBuzzFace> {
    4646public:
    4747    static const hb_tag_t vertTag;
    4848    static const hb_tag_t vrt2Tag;
    4949
    50     static PassRefPtr<HarfBuzzNGFace> create(FontPlatformData* platformData, uint64_t uniqueID)
     50    static PassRefPtr<HarfBuzzFace> create(FontPlatformData* platformData, uint64_t uniqueID)
    5151    {
    52         return adoptRef(new HarfBuzzNGFace(platformData, uniqueID));
     52        return adoptRef(new HarfBuzzFace(platformData, uniqueID));
    5353    }
    54     ~HarfBuzzNGFace();
     54    ~HarfBuzzFace();
    5555
    5656    hb_font_t* createFont();
    … …  
    5959
    6060private:
    61     HarfBuzzNGFace(FontPlatformData*, uint64_t);
     61    HarfBuzzFace(FontPlatformData*, uint64_t);
    6262
    6363    hb_face_t* createFace();
    … …  
    7373}
    7474
    75 #endif // HarfBuzzNGFace_h
     75#endif // HarfBuzzFace_h

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

    r141290 r141291  
    3131
    3232#include "config.h"
    33 #include "HarfBuzzNGFace.h"
     33#include "HarfBuzzFace.h"
    3434
    3535#include "FontPlatformData.h"
    … …  
    9191}
    9292
    93 static hb_bool_t harfbuzzGetGlyph(hb_font_t*, void* fontData, hb_codepoint_t unicode, hb_codepoint_t, hb_codepoint_t* glyph, void*)
     93static hb_bool_t harfBuzzGetGlyph(hb_font_t*, void* fontData, hb_codepoint_t unicode, hb_codepoint_t, hb_codepoint_t* glyph, void*)
    9494{
    9595    FontPlatformData* platformData = reinterpret_cast<FontPlatformData*>(fontData);
    … …  
    109109}
    110110
    111 static hb_position_t harfbuzzGetGlyphHorizontalAdvance(hb_font_t*, void* fontData, hb_codepoint_t glyph, void*)
     111static hb_position_t harfBuzzGetGlyphHorizontalAdvance(hb_font_t*, void* fontData, hb_codepoint_t glyph, void*)
    112112{
    113113    FontPlatformData* platformData = reinterpret_cast<FontPlatformData*>(fontData);
    … …  
    120120}
    121121
    122 static hb_bool_t harfbuzzGetGlyphHorizontalOrigin(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*)
     122static hb_bool_t harfBuzzGetGlyphHorizontalOrigin(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*)
    123123{
    124124    // Just return true, following the way that Harfbuzz-FreeType
    … …  
    127127}
    128128
    129 static hb_bool_t harfbuzzGetGlyphExtents(hb_font_t*, void* fontData, hb_codepoint_t glyph, hb_glyph_extents_t* extents, void*)
     129static hb_bool_t harfBuzzGetGlyphExtents(hb_font_t*, void* fontData, hb_codepoint_t glyph, hb_glyph_extents_t* extents, void*)
    130130{
    131131    FontPlatformData* platformData = reinterpret_cast<FontPlatformData*>(fontData);
    … …  
    137137}
    138138
    139 static hb_font_funcs_t* harfbuzzCairoTextGetFontFuncs()
    140 {
    141     static hb_font_funcs_t* harfbuzzCairoFontFuncs = 0;
     139static hb_font_funcs_t* harfBuzzCairoTextGetFontFuncs()
     140{
     141    static hb_font_funcs_t* harfBuzzCairoFontFuncs = 0;
    142142
    143143    // We don't set callback functions which we can't support.
    144144    // Harfbuzz will use the fallback implementation if they aren't set.
    145     if (!harfbuzzCairoFontFuncs) {
    146         harfbuzzCairoFontFuncs = hb_font_funcs_create();
    147         hb_font_funcs_set_glyph_func(harfbuzzCairoFontFuncs, harfbuzzGetGlyph, 0, 0);
    148         hb_font_funcs_set_glyph_h_advance_func(harfbuzzCairoFontFuncs, harfbuzzGetGlyphHorizontalAdvance, 0, 0);
    149         hb_font_funcs_set_glyph_h_origin_func(harfbuzzCairoFontFuncs, harfbuzzGetGlyphHorizontalOrigin, 0, 0);
    150         hb_font_funcs_set_glyph_extents_func(harfbuzzCairoFontFuncs, harfbuzzGetGlyphExtents, 0, 0);
    151         hb_font_funcs_make_immutable(harfbuzzCairoFontFuncs);
    152     }
    153     return harfbuzzCairoFontFuncs;
    154 }
    155 
    156 static hb_blob_t* harfbuzzCairoGetTable(hb_face_t*, hb_tag_t tag, void* userData)
     145    if (!harfBuzzCairoFontFuncs) {
     146        harfBuzzCairoFontFuncs = hb_font_funcs_create();
     147        hb_font_funcs_set_glyph_func(harfBuzzCairoFontFuncs, harfBuzzGetGlyph, 0, 0);
     148        hb_font_funcs_set_glyph_h_advance_func(harfBuzzCairoFontFuncs, harfBuzzGetGlyphHorizontalAdvance, 0, 0);
     149        hb_font_funcs_set_glyph_h_origin_func(harfBuzzCairoFontFuncs, harfBuzzGetGlyphHorizontalOrigin, 0, 0);
     150        hb_font_funcs_set_glyph_extents_func(harfBuzzCairoFontFuncs, harfBuzzGetGlyphExtents, 0, 0);
     151        hb_font_funcs_make_immutable(harfBuzzCairoFontFuncs);
     152    }
     153    return harfBuzzCairoFontFuncs;
     154}
     155
     156static hb_blob_t* harfBuzzCairoGetTable(hb_face_t*, hb_tag_t tag, void* userData)
    157157{
    158158    cairo_scaled_font_t* scaledFont = reinterpret_cast<cairo_scaled_font_t*>(userData);
    … …  
    183183}
    184184
    185 hb_face_t* HarfBuzzNGFace::createFace()
    186 {
    187     hb_face_t* face = hb_face_create_for_tables(harfbuzzCairoGetTable, m_platformData->scaledFont(), 0);
     185hb_face_t* HarfBuzzFace::createFace()
     186{
     187    hb_face_t* face = hb_face_create_for_tables(harfBuzzCairoGetTable, m_platformData->scaledFont(), 0);
    188188    ASSERT(face);
    189189    return face;
    190190}
    191191
    192 hb_font_t* HarfBuzzNGFace::createFont()
     192hb_font_t* HarfBuzzFace::createFont()
    193193{
    194194    hb_font_t* font = hb_font_create(m_face);
    195     hb_font_set_funcs(font, harfbuzzCairoTextGetFontFuncs(), m_platformData, 0);
     195    hb_font_set_funcs(font, harfBuzzCairoTextGetFontFuncs(), m_platformData, 0);
    196196    const float size = m_platformData->size();
    197197    if (floorf(size) == size)

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

    r141290 r141291  
    3030
    3131#include "config.h"
    32 #include "HarfBuzzNGFace.h"
     32#include "HarfBuzzFace.h"
    3333
    3434#include "FontPlatformData.h"
    … …  
    8888static hb_font_funcs_t* harfbuzzCoreTextGetFontFuncs()
    8989{
    90     static hb_font_funcs_t* harfbuzzCoreTextFontFuncs = 0;
     90    static hb_font_funcs_t* harfBuzzCoreTextFontFuncs = 0;
    9191
    92     if (!harfbuzzCoreTextFontFuncs) {
    93         harfbuzzCoreTextFontFuncs = hb_font_funcs_create();
    94         hb_font_funcs_set_glyph_func(harfbuzzCoreTextFontFuncs, getGlyph, 0, 0);
    95         hb_font_funcs_set_glyph_h_advance_func(harfbuzzCoreTextFontFuncs, getGlyphHorizontalAdvance, 0, 0);
    96         hb_font_funcs_set_glyph_h_origin_func(harfbuzzCoreTextFontFuncs, getGlyphHorizontalOrigin, 0, 0);
    97         hb_font_funcs_set_glyph_extents_func(harfbuzzCoreTextFontFuncs, getGlyphExtents, 0, 0);
    98         hb_font_funcs_make_immutable(harfbuzzCoreTextFontFuncs);
     92    if (!harfBuzzCoreTextFontFuncs) {
     93        harfBuzzCoreTextFontFuncs = hb_font_funcs_create();
     94        hb_font_funcs_set_glyph_func(harfBuzzCoreTextFontFuncs, getGlyph, 0, 0);
     95        hb_font_funcs_set_glyph_h_advance_func(harfBuzzCoreTextFontFuncs, getGlyphHorizontalAdvance, 0, 0);
     96        hb_font_funcs_set_glyph_h_origin_func(harfBuzzCoreTextFontFuncs, getGlyphHorizontalOrigin, 0, 0);
     97        hb_font_funcs_set_glyph_extents_func(harfBuzzCoreTextFontFuncs, getGlyphExtents, 0, 0);
     98        hb_font_funcs_make_immutable(harfBuzzCoreTextFontFuncs);
    9999    }
    100     return harfbuzzCoreTextFontFuncs;
     100    return harfBuzzCoreTextFontFuncs;
    101101}
    102102
    … …  
    107107}
    108108
    109 static hb_blob_t* harfbuzzCoreTextGetTable(hb_face_t* face, hb_tag_t tag, void* userData)
     109static hb_blob_t* harfBuzzCoreTextGetTable(hb_face_t* face, hb_tag_t tag, void* userData)
    110110{
    111111    CGFontRef cgFont = reinterpret_cast<CGFontRef>(userData);
    … …  
    121121}
    122122
    123 hb_face_t* HarfBuzzNGFace::createFace()
     123hb_face_t* HarfBuzzFace::createFace()
    124124{
    125125    // It seems that CTFontCopyTable of MacOSX10.5 sdk doesn't work for
    126126    // OpenType layout tables(GDEF, GSUB, GPOS). Use CGFontCopyTableForTag instead.
    127     hb_face_t* face = hb_face_create_for_tables(harfbuzzCoreTextGetTable, m_platformData->cgFont(), 0);
     127    hb_face_t* face = hb_face_create_for_tables(harfBuzzCoreTextGetTable, m_platformData->cgFont(), 0);
    128128    ASSERT(face);
    129129    return face;
    130130}
    131131
    132 hb_font_t* HarfBuzzNGFace::createFont()
     132hb_font_t* HarfBuzzFace::createFont()
    133133{
    134134    hb_font_t* font = hb_font_create(m_face);
    135     hb_font_set_funcs(font, harfbuzzCoreTextGetFontFuncs(), m_platformData, 0);
     135    hb_font_set_funcs(font, harfBuzzCoreTextGetFontFuncs(), m_platformData, 0);
    136136    const float size = m_platformData->m_size;
    137137    hb_font_set_ppem(font, size, size);

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

    r141290 r141291  
    3030
    3131#include "config.h"
    32 #include "HarfBuzzNGFace.h"
     32#include "HarfBuzzFace.h"
    3333
    3434#include "FontPlatformData.h"
    … …  
    4848namespace WebCore {
    4949
    50 // Our implementation of the callbacks which Harfbuzz requires by using Skia
    51 // calls. See the Harfbuzz source for references about what these callbacks do.
     50// Our implementation of the callbacks which HarfBuzz requires by using Skia
     51// calls. See the HarfBuzz source for references about what these callbacks do.
    5252
    5353struct HarfBuzzFontData {
    … …  
    5959};
    6060
    61 static hb_position_t SkiaScalarToHarfbuzzPosition(SkScalar value)
     61static hb_position_t SkiaScalarToHarfBuzzPosition(SkScalar value)
    6262{
    6363    return SkScalarToFixed(value);
    … …  
    7575    paint->getTextWidths(&glyph, sizeof(glyph), &skWidth, &skBounds);
    7676    if (width)
    77         *width = SkiaScalarToHarfbuzzPosition(skWidth);
     77        *width = SkiaScalarToHarfBuzzPosition(skWidth);
    7878    if (extents) {
    79         // Invert y-axis because Skia is y-grows-down but we set up harfbuzz to be y-grows-up.
    80         extents->x_bearing = SkiaScalarToHarfbuzzPosition(skBounds.fLeft);
    81         extents->y_bearing = SkiaScalarToHarfbuzzPosition(-skBounds.fTop);
    82         extents->width = SkiaScalarToHarfbuzzPosition(skBounds.width());
    83         extents->height = SkiaScalarToHarfbuzzPosition(-skBounds.height());
     79        // Invert y-axis because Skia is y-grows-down but we set up HarfBuzz to be y-grows-up.
     80        extents->x_bearing = SkiaScalarToHarfBuzzPosition(skBounds.fLeft);
     81        extents->y_bearing = SkiaScalarToHarfBuzzPosition(-skBounds.fTop);
     82        extents->width = SkiaScalarToHarfBuzzPosition(skBounds.width());
     83        extents->height = SkiaScalarToHarfBuzzPosition(-skBounds.height());
    8484    }
    8585}
    8686
    87 static hb_bool_t harfbuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoint_t unicode, hb_codepoint_t variationSelector, hb_codepoint_t* glyph, void* userData)
     87static hb_bool_t harfBuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoint_t unicode, hb_codepoint_t variationSelector, hb_codepoint_t* glyph, void* userData)
    8888{
    8989    HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData);
    … …  
    102102}
    103103
    104 static hb_position_t harfbuzzGetGlyphHorizontalAdvance(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, void* userData)
     104static hb_position_t harfBuzzGetGlyphHorizontalAdvance(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, void* userData)
    105105{
    106106    HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData);
    … …  
    111111}
    112112
    113 static hb_bool_t harfbuzzGetGlyphHorizontalOrigin(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, hb_position_t* x, hb_position_t* y, void* userData)
     113static hb_bool_t harfBuzzGetGlyphHorizontalOrigin(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, hb_position_t* x, hb_position_t* y, void* userData)
    114114{
    115     // Just return true, following the way that Harfbuzz-FreeType
     115    // Just return true, following the way that HarfBuzz-FreeType
    116116    // implementation does.
    117117    return true;
    118118}
    119119
    120 static hb_bool_t harfbuzzGetGlyphExtents(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, hb_glyph_extents_t* extents, void* userData)
     120static hb_bool_t harfBuzzGetGlyphExtents(hb_font_t* hbFont, void* fontData, hb_codepoint_t glyph, hb_glyph_extents_t* extents, void* userData)
    121121{
    122122    HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData);
    … …  
    126126}
    127127
    128 static hb_font_funcs_t* harfbuzzSkiaGetFontFuncs()
     128static hb_font_funcs_t* harfBuzzSkiaGetFontFuncs()
    129129{
    130     static hb_font_funcs_t* harfbuzzSkiaFontFuncs = 0;
     130    static hb_font_funcs_t* harfBuzzSkiaFontFuncs = 0;
    131131
    132132    // We don't set callback functions which we can't support.
    133     // Harfbuzz will use the fallback implementation if they aren't set.
    134     if (!harfbuzzSkiaFontFuncs) {
    135         harfbuzzSkiaFontFuncs = hb_font_funcs_create();
    136         hb_font_funcs_set_glyph_func(harfbuzzSkiaFontFuncs, harfbuzzGetGlyph, 0, 0);
    137         hb_font_funcs_set_glyph_h_advance_func(harfbuzzSkiaFontFuncs, harfbuzzGetGlyphHorizontalAdvance, 0, 0);
    138         hb_font_funcs_set_glyph_h_origin_func(harfbuzzSkiaFontFuncs, harfbuzzGetGlyphHorizontalOrigin, 0, 0);
    139         hb_font_funcs_set_glyph_extents_func(harfbuzzSkiaFontFuncs, harfbuzzGetGlyphExtents, 0, 0);
    140         hb_font_funcs_make_immutable(harfbuzzSkiaFontFuncs);
     133    // HarfBuzz will use the fallback implementation if they aren't set.
     134    if (!harfBuzzSkiaFontFuncs) {
     135        harfBuzzSkiaFontFuncs = hb_font_funcs_create();
     136        hb_font_funcs_set_glyph_func(harfBuzzSkiaFontFuncs, harfBuzzGetGlyph, 0, 0);
     137        hb_font_funcs_set_glyph_h_advance_func(harfBuzzSkiaFontFuncs, harfBuzzGetGlyphHorizontalAdvance, 0, 0);
     138        hb_font_funcs_set_glyph_h_origin_func(harfBuzzSkiaFontFuncs, harfBuzzGetGlyphHorizontalOrigin, 0, 0);
     139        hb_font_funcs_set_glyph_extents_func(harfBuzzSkiaFontFuncs, harfBuzzGetGlyphExtents, 0, 0);
     140        hb_font_funcs_make_immutable(harfBuzzSkiaFontFuncs);
    141141    }
    142     return harfbuzzSkiaFontFuncs;
     142    return harfBuzzSkiaFontFuncs;
    143143}
    144144
    145 static hb_blob_t* harfbuzzSkiaGetTable(hb_face_t* face, hb_tag_t tag, void* userData)
     145static hb_blob_t* harfBuzzSkiaGetTable(hb_face_t* face, hb_tag_t tag, void* userData)
    146146{
    147147    SkFontID uniqueID = static_cast<SkFontID>(reinterpret_cast<uint64_t>(userData));
    … …  
    160160    }
    161161
    162     return hb_blob_create(const_cast<char*>(buffer), tableSize,
    163                           HB_MEMORY_MODE_WRITABLE, buffer, fastFree);
     162    return hb_blob_create(const_cast<char*>(buffer), tableSize, HB_MEMORY_MODE_WRITABLE, buffer, fastFree);
    164163}
    165164
    … …  
    170169}
    171170
    172 hb_face_t* HarfBuzzNGFace::createFace()
     171hb_face_t* HarfBuzzFace::createFace()
    173172{
    174     hb_face_t* face = hb_face_create_for_tables(harfbuzzSkiaGetTable, reinterpret_cast<void*>(m_platformData->uniqueID()), 0);
     173    hb_face_t* face = hb_face_create_for_tables(harfBuzzSkiaGetTable, reinterpret_cast<void*>(m_platformData->uniqueID()), 0);
    175174    ASSERT(face);
    176175    return face;
    177176}
    178177
    179 hb_font_t* HarfBuzzNGFace::createFont()
     178hb_font_t* HarfBuzzFace::createFont()
    180179{
    181180    HarfBuzzFontData* hbFontData = new HarfBuzzFontData(m_glyphCacheForFaceCacheEntry);
    182181    m_platformData->setupPaint(&hbFontData->m_paint);
    183182    hb_font_t* font = hb_font_create(m_face);
    184     hb_font_set_funcs(font, harfbuzzSkiaGetFontFuncs(), hbFontData, destroyHarfBuzzFontData);
     183    hb_font_set_funcs(font, harfBuzzSkiaGetFontFuncs(), hbFontData, destroyHarfBuzzFontData);
    185184    float size = m_platformData->size();
    186     int scale = SkiaScalarToHarfbuzzPosition(size);
     185    int scale = SkiaScalarToHarfBuzzPosition(size);
    187186    hb_font_set_scale(font, scale, scale);
    188187    hb_font_make_immutable(font);

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

    r141290 r141291  
    3333
    3434#include "Font.h"
    35 #include "HarfBuzzNGFace.h"
     35#include "HarfBuzzFace.h"
    3636#include "SurrogatePairAwareTextIterator.h"
    3737#include "TextRun.h"
    … …  
    6868};
    6969
    70 static inline float harfbuzzPositionToFloat(hb_position_t value)
     70static inline float harfBuzzPositionToFloat(hb_position_t value)
    7171{
    7272    return static_cast<float>(value) / (1 << 16);
    … …  
    8282}
    8383
    84 void HarfBuzzShaper::HarfBuzzRun::applyShapeResult(hb_buffer_t* harfbuzzBuffer)
    85 {
    86     m_numGlyphs = hb_buffer_get_length(harfbuzzBuffer);
     84void HarfBuzzShaper::HarfBuzzRun::applyShapeResult(hb_buffer_t* harfBuzzBuffer)
     85{
     86    m_numGlyphs = hb_buffer_get_length(harfBuzzBuffer);
    8787    m_glyphs.resize(m_numGlyphs);
    8888    m_advances.resize(m_numGlyphs);
    … …  
    204204    const FontDescription& description = m_font->fontDescription();
    205205    if (description.orientation() == Vertical) {
    206         static hb_feature_t vert = { HarfBuzzNGFace::vertTag, 1, 0, static_cast<unsigned>(-1) };
    207         static hb_feature_t vrt2 = { HarfBuzzNGFace::vrt2Tag, 1, 0, static_cast<unsigned>(-1) };
     206        static hb_feature_t vert = { HarfBuzzFace::vertTag, 1, 0, static_cast<unsigned>(-1) };
     207        static hb_feature_t vrt2 = { HarfBuzzFace::vrt2Tag, 1, 0, static_cast<unsigned>(-1) };
    208208        m_features.append(vert);
    209209        m_features.append(vrt2);
    … …  
    306306        unsigned numCharactersOfCurrentRun = iterator.currentCharacter() - startIndexOfCurrentRun;
    307307        hb_script_t script = hb_icu_script_to_script(currentScript);
    308         m_harfbuzzRuns.append(HarfBuzzRun::create(currentFontData, startIndexOfCurrentRun, numCharactersOfCurrentRun, m_run.direction(), script));
     308        m_harfBuzzRuns.append(HarfBuzzRun::create(currentFontData, startIndexOfCurrentRun, numCharactersOfCurrentRun, m_run.direction(), script));
    309309        currentFontData = nextFontData;
    310310        startIndexOfCurrentRun = iterator.currentCharacter();
    311311    } while (iterator.consume(character, clusterLength));
    312312
    313     return !m_harfbuzzRuns.isEmpty();
     313    return !m_harfBuzzRuns.isEmpty();
    314314}
    315315
    316316bool HarfBuzzShaper::shapeHarfBuzzRuns(bool shouldSetDirection)
    317317{
    318     HarfBuzzScopedPtr<hb_buffer_t> harfbuzzBuffer(hb_buffer_create(), hb_buffer_destroy);
    319 
    320     hb_buffer_set_unicode_funcs(harfbuzzBuffer.get(), hb_icu_get_unicode_funcs());
    321 
    322     for (unsigned i = 0; i < m_harfbuzzRuns.size(); ++i) {
    323         unsigned runIndex = m_run.rtl() ? m_harfbuzzRuns.size() - i - 1 : i;
    324         HarfBuzzRun* currentRun = m_harfbuzzRuns[runIndex].get();
     318    HarfBuzzScopedPtr<hb_buffer_t> harfBuzzBuffer(hb_buffer_create(), hb_buffer_destroy);
     319
     320    hb_buffer_set_unicode_funcs(harfBuzzBuffer.get(), hb_icu_get_unicode_funcs());
     321
     322    for (unsigned i = 0; i < m_harfBuzzRuns.size(); ++i) {
     323        unsigned runIndex = m_run.rtl() ? m_harfBuzzRuns.size() - i - 1 : i;
     324        HarfBuzzRun* currentRun = m_harfBuzzRuns[runIndex].get();
    325325        const SimpleFontData* currentFontData = currentRun->fontData();
    326326
    327         hb_buffer_set_script(harfbuzzBuffer.get(), currentRun->script());
     327        hb_buffer_set_script(harfBuzzBuffer.get(), currentRun->script());
    328328        if (shouldSetDirection)
    329             hb_buffer_set_direction(harfbuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
     329            hb_buffer_set_direction(harfBuzzBuffer.get(), currentRun->rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
    330330
    331331        // Add a space as pre-context to the buffer. This prevents showing dotted-circle
    332332        // for combining marks at the beginning of runs.
    333333        static const uint16_t preContext = ' ';
    334         hb_buffer_add_utf16(harfbuzzBuffer.get(), &preContext, 1, 1, 0);
     334        hb_buffer_add_utf16(harfBuzzBuffer.get(), &preContext, 1, 1, 0);
    335335
    336336        if (m_font->isSmallCaps() && u_islower(m_normalizedBuffer[currentRun->startIndex()])) {
    … …  
    338338            upperText.makeUpper();
    339339            currentFontData = m_font->glyphDataForCharacter(upperText[0], false, SmallCapsVariant).fontData;
    340             hb_buffer_add_utf16(harfbuzzBuffer.get(), upperText.characters(), currentRun->numCharacters(), 0, currentRun->numCharacters());
     340            hb_buffer_add_utf16(harfBuzzBuffer.get(), upperText.characters(), currentRun->numCharacters(), 0, currentRun->numCharacters());
    341341        } else
    342             hb_buffer_add_utf16(harfbuzzBuffer.get(), m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters(), 0, currentRun->numCharacters());
     342            hb_buffer_add_utf16(harfBuzzBuffer.get(), m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters(), 0, currentRun->numCharacters());
    343343
    344344        FontPlatformData* platformData = const_cast<FontPlatformData*>(&currentFontData->platformData());
    345         HarfBuzzNGFace* face = platformData->harfbuzzFace();
     345        HarfBuzzFace* face = platformData->harfBuzzFace();
    346346        if (!face)
    347347            return false;
    348348
    349349        if (m_font->fontDescription().orientation() == Vertical)
    350             face->setScriptForVerticalGlyphSubstitution(harfbuzzBuffer.get());
    351 
    352         HarfBuzzScopedPtr<hb_font_t> harfbuzzFont(face->createFont(), hb_font_destroy);
    353 
    354         hb_shape(harfbuzzFont.get(), harfbuzzBuffer.get(), m_features.isEmpty() ? 0 : m_features.data(), m_features.size());
    355 
    356         currentRun->applyShapeResult(harfbuzzBuffer.get());
    357         setGlyphPositionsForHarfBuzzRun(currentRun, harfbuzzBuffer.get());
    358 
    359         hb_buffer_reset(harfbuzzBuffer.get());
     350            face->setScriptForVerticalGlyphSubstitution(harfBuzzBuffer.get());
     351
     352        HarfBuzzScopedPtr<hb_font_t> harfBuzzFont(face->createFont(), hb_font_destroy);
     353
     354        hb_shape(harfBuzzFont.get(), harfBuzzBuffer.get(), m_features.isEmpty() ? 0 : m_features.data(), m_features.size());
     355
     356        currentRun->applyShapeResult(harfBuzzBuffer.get());
     357        setGlyphPositionsForHarfBuzzRun(currentRun, harfBuzzBuffer.get());
     358
     359        hb_buffer_reset(harfBuzzBuffer.get());
    360360    }
    361361
    … …  
    363363}
    364364
    365 void HarfBuzzShaper::setGlyphPositionsForHarfBuzzRun(HarfBuzzRun* currentRun, hb_buffer_t* harfbuzzBuffer)
     365void HarfBuzzShaper::setGlyphPositionsForHarfBuzzRun(HarfBuzzRun* currentRun, hb_buffer_t* harfBuzzBuffer)
    366366{
    367367    const SimpleFontData* currentFontData = currentRun->fontData();
    368     hb_glyph_info_t* glyphInfos = hb_buffer_get_glyph_infos(harfbuzzBuffer, 0);
    369     hb_glyph_position_t* glyphPositions = hb_buffer_get_glyph_positions(harfbuzzBuffer, 0);
     368    hb_glyph_info_t* glyphInfos = hb_buffer_get_glyph_infos(harfBuzzBuffer, 0);
     369    hb_glyph_position_t* glyphPositions = hb_buffer_get_glyph_positions(harfBuzzBuffer, 0);
    370370
    371371    unsigned numGlyphs = currentRun->numGlyphs();
    … …  
    377377        bool runEnd = i + 1 == numGlyphs;
    378378        uint16_t glyph = glyphInfos[i].codepoint;
    379         float offsetX = harfbuzzPositionToFloat(glyphPositions[i].x_offset);
    380         float offsetY = -harfbuzzPositionToFloat(glyphPositions[i].y_offset);
    381         float advance = harfbuzzPositionToFloat(glyphPositions[i].x_advance);
     379        float offsetX = harfBuzzPositionToFloat(glyphPositions[i].x_offset);
     380        float offsetY = -harfBuzzPositionToFloat(glyphPositions[i].y_offset);
     381        float advance = harfBuzzPositionToFloat(glyphPositions[i].x_advance);
    382382
    383383        unsigned currentCharacterIndex = currentRun->startIndex() + glyphInfos[i].cluster;
    … …  
    444444bool HarfBuzzShaper::fillGlyphBuffer(GlyphBuffer* glyphBuffer)
    445445{
    446     unsigned numRuns = m_harfbuzzRuns.size();
     446    unsigned numRuns = m_harfBuzzRuns.size();
    447447    if (m_run.rtl()) {
    448         m_startOffset = m_harfbuzzRuns.last()->offsets()[0];
     448        m_startOffset = m_harfBuzzRuns.last()->offsets()[0];
    449449        for (int runIndex = numRuns - 1; runIndex >= 0; --runIndex) {
    450             HarfBuzzRun* currentRun = m_harfbuzzRuns[runIndex].get();
    451             FloatPoint firstOffsetOfNextRun = !runIndex ? FloatPoint() : m_harfbuzzRuns[runIndex - 1]->offsets()[0];
     450            HarfBuzzRun* currentRun = m_harfBuzzRuns[runIndex].get();
     451            FloatPoint firstOffsetOfNextRun = !runIndex ? FloatPoint() : m_harfBuzzRuns[runIndex - 1]->offsets()[0];
    452452            fillGlyphBufferFromHarfBuzzRun(glyphBuffer, currentRun, firstOffsetOfNextRun);
    453453        }
    454454    } else {
    455         m_startOffset = m_harfbuzzRuns.first()->offsets()[0];
     455        m_startOffset = m_harfBuzzRuns.first()->offsets()[0];
    456456        for (unsigned runIndex = 0; runIndex < numRuns; ++runIndex) {
    457             HarfBuzzRun* currentRun = m_harfbuzzRuns[runIndex].get();
    458             FloatPoint firstOffsetOfNextRun = runIndex == numRuns - 1 ? FloatPoint() : m_harfbuzzRuns[runIndex + 1]->offsets()[0];
     457            HarfBuzzRun* currentRun = m_harfBuzzRuns[runIndex].get();
     458            FloatPoint firstOffsetOfNextRun = runIndex == numRuns - 1 ? FloatPoint() : m_harfBuzzRuns[runIndex + 1]->offsets()[0];
    459459            fillGlyphBufferFromHarfBuzzRun(glyphBuffer, currentRun, firstOffsetOfNextRun);
    460460        }
    … …  
    470470    if (m_run.rtl()) {
    471471        charactersSoFar = m_normalizedBufferLength;
    472         for (int i = m_harfbuzzRuns.size() - 1; i >= 0; --i) {
    473             charactersSoFar -= m_harfbuzzRuns[i]->numCharacters();
    474             float nextX = currentX + m_harfbuzzRuns[i]->width();
     472        for (int i = m_harfBuzzRuns.size() - 1; i >= 0; --i) {
     473            charactersSoFar -= m_harfBuzzRuns[i]->numCharacters();
     474            float nextX = currentX + m_harfBuzzRuns[i]->width();
    475475            float offsetForRun = targetX - currentX;
    476             if (offsetForRun >= 0 && offsetForRun <= m_harfbuzzRuns[i]->width()) {
     476            if (offsetForRun >= 0 && offsetForRun <= m_harfBuzzRuns[i]->width()) {
    477477                // The x value in question is within this script run.
    478                 const unsigned index = m_harfbuzzRuns[i]->characterIndexForXPosition(offsetForRun);
     478                const unsigned index = m_harfBuzzRuns[i]->characterIndexForXPosition(offsetForRun);
    479479                return charactersSoFar + index;
    480480            }
    … …  
    482482        }
    483483    } else {
    484         for (unsigned i = 0; i < m_harfbuzzRuns.size(); ++i) {
    485             float nextX = currentX + m_harfbuzzRuns[i]->width();
     484        for (unsigned i = 0; i < m_harfBuzzRuns.size(); ++i) {
     485            float nextX = currentX + m_harfBuzzRuns[i]->width();
    486486            float offsetForRun = targetX - currentX;
    487             if (offsetForRun >= 0 && offsetForRun <= m_harfbuzzRuns[i]->width()) {
    488                 const unsigned index = m_harfbuzzRuns[i]->characterIndexForXPosition(offsetForRun);
     487            if (offsetForRun >= 0 && offsetForRun <= m_harfBuzzRuns[i]->width()) {
     488                const unsigned index = m_harfBuzzRuns[i]->characterIndexForXPosition(offsetForRun);
    489489                return charactersSoFar + index;
    490490            }
    491             charactersSoFar += m_harfbuzzRuns[i]->numCharacters();
     491            charactersSoFar += m_harfBuzzRuns[i]->numCharacters();
    492492            currentX = nextX;
    493493        }
    … …  
    507507    if (m_run.rtl())
    508508        currentX = m_totalWidth;
    509     for (unsigned i = 0; i < m_harfbuzzRuns.size(); ++i) {
     509    for (unsigned i = 0; i < m_harfBuzzRuns.size(); ++i) {
    510510        if (m_run.rtl())
    511             currentX -= m_harfbuzzRuns[i]->width();
    512         int numCharacters = m_harfbuzzRuns[i]->numCharacters();
     511            currentX -= m_harfBuzzRuns[i]->width();
     512        int numCharacters = m_harfBuzzRuns[i]->numCharacters();
    513513        if (!foundFromX && from >= 0 && from < numCharacters) {
    514             fromX = m_harfbuzzRuns[i]->xPositionForOffset(from) + currentX;
     514            fromX = m_harfBuzzRuns[i]->xPositionForOffset(from) + currentX;
    515515            foundFromX = true;
    516516        } else
    … …  
    518518
    519519        if (!foundToX && to >= 0 && to < numCharacters) {
    520             toX = m_harfbuzzRuns[i]->xPositionForOffset(to) + currentX;
     520            toX = m_harfBuzzRuns[i]->xPositionForOffset(to) + currentX;
    521521            foundToX = true;
    522522        } else
    … …  
    526526            break;
    527527        if (!m_run.rtl())
    528             currentX += m_harfbuzzRuns[i]->width();
     528            currentX += m_harfBuzzRuns[i]->width();
    529529    }
    530530

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

    r141290 r141291  
    113113
    114114    Vector<hb_feature_t, 4> m_features;
    115     Vector<OwnPtr<HarfBuzzRun>, 16> m_harfbuzzRuns;
     115    Vector<OwnPtr<HarfBuzzRun>, 16> m_harfBuzzRuns;
    116116
    117117    FloatPoint m_startOffset;
Note: See TracChangeset for help on using the changeset viewer.