Changeset 188566 in webkit


Ignore:
Timestamp:
Aug 17, 2015 7:07:57 PM (9 years ago)
Author:
mmaxfield@apple.com
Message:

[OS X] Remove support for composite fonts
​https://bugs.webkit.org/show_bug.cgi?id=147920

Reviewed by Dan Bernstein.

Source/WebCore:

WebKit maintains a cache of code point to glyph mapping for a particular font. One of
the ways WebKit populates this cache is to create a string holding consecutive code
points, create a CTLineRef from the string, and use CTRunGetGlyphs() with
CTRunGetStringIndices() to map from the code points to the glyphs. This approach is
fundamentally incorrect, as it will combine consecutive code points together in the
string if possible to produce a glyph.

The only way WebKit will ever trigger this code path is if we are inspecting a
composite font, first introduced in [1]. These composite fonts are extremely rare
because:

  1. None of the preinstalled fonts on either OS X nor iOS are composite fonts,
  2. WebKit does not support loading web fonts from composite font files, and
  3. WebKit's support only ever existed on OS X (none of the other ports).

In fact, no one I've consulted with has ever seen any of these fonts used in the wild.
The fonts also require a fundamentally broken code path, and add complexity to WebKit.

[1] ​https://bugs.webkit.org/attachment.cgi?id=134923&action=review

No new tests.

  • platform/graphics/Font.h:
  • platform/graphics/FontPlatformData.cpp:

(WebCore::FontPlatformData::FontPlatformData): Deleted.
(WebCore::FontPlatformData::operator=): Deleted.

  • platform/graphics/FontPlatformData.h:

(WebCore::FontPlatformData::isCompositeFontReference): Deleted.
(WebCore::FontPlatformData::operator==): Deleted.

  • platform/graphics/cocoa/FontCocoa.mm:

(WebCore::Font::compositeFontReferenceFont): Deleted.

  • platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::FontPlatformData): Deleted.
(WebCore::FontPlatformData::setFont): Deleted.

  • platform/graphics/mac/GlyphPageMac.cpp:

(WebCore::shouldUseCoreText):
(WebCore::GlyphPage::fill):

Tools:

  • DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
  • DumpRenderTree/fonts/SampleFont.sfont: Removed.
  • DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
  • DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
  • DumpRenderTree/mac/DumpRenderTree.mm:

(allowedFontFamilySet): Deleted.
(activateTestingFonts): Deleted.

  • WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:

(WTR::allowedFontFamilySet): Deleted.
(WTR::activateFonts): Deleted.

  • WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
  • WebKitTestRunner/fonts/SampleFont.sfont: Removed.
  • WebKitTestRunner/mac/TestControllerMac.mm:

(WTR::allowedFontFamilySet): Deleted.

LayoutTests:

  • fast/text/international/text-spliced-font.html: Removed.
  • platform/efl/fast/text/international/text-spliced-font-expected.png: Removed.
  • platform/efl/fast/text/international/text-spliced-font-expected.txt: Removed.
  • platform/gtk/fast/text/international/text-spliced-font-expected.png: Removed.
  • platform/gtk/fast/text/international/text-spliced-font-expected.txt: Removed.
  • platform/ios-simulator-wk2/fast/text/international/text-spliced-font-expected.txt: Removed.
  • platform/ios-simulator/fast/text/international/text-spliced-font-expected.txt: Removed.
  • platform/mac/fast/text/international/text-spliced-font-expected.png: Removed.
  • platform/mac/fast/text/international/text-spliced-font-expected.txt: Removed.
  • platform/win/fast/text/international/text-spliced-font-expected.png: Removed.
  • platform/win/fast/text/international/text-spliced-font-expected.txt: Removed.
Location:
trunk
Files:
13 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r188562 r188566  
     12015-08-17  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [OS X] Remove support for composite fonts
     4        https://bugs.webkit.org/show_bug.cgi?id=147920
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * fast/text/international/text-spliced-font.html: Removed.
     9        * platform/efl/fast/text/international/text-spliced-font-expected.png: Removed.
     10        * platform/efl/fast/text/international/text-spliced-font-expected.txt: Removed.
     11        * platform/gtk/fast/text/international/text-spliced-font-expected.png: Removed.
     12        * platform/gtk/fast/text/international/text-spliced-font-expected.txt: Removed.
     13        * platform/ios-simulator-wk2/fast/text/international/text-spliced-font-expected.txt: Removed.
     14        * platform/ios-simulator/fast/text/international/text-spliced-font-expected.txt: Removed.
     15        * platform/mac/fast/text/international/text-spliced-font-expected.png: Removed.
     16        * platform/mac/fast/text/international/text-spliced-font-expected.txt: Removed.
     17        * platform/win/fast/text/international/text-spliced-font-expected.png: Removed.
     18        * platform/win/fast/text/international/text-spliced-font-expected.txt: Removed.
     19
    1202015-08-17  Myles C. Maxfield  <mmaxfield@apple.com>
    221

  • trunk/Source/WebCore/ChangeLog

    r188565 r188566  
     12015-08-17  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [OS X] Remove support for composite fonts
     4        https://bugs.webkit.org/show_bug.cgi?id=147920
     5
     6        Reviewed by Dan Bernstein.
     7
     8        WebKit maintains a cache of code point to glyph mapping for a particular font. One of
     9        the ways WebKit populates this cache is to create a string holding consecutive code
     10        points, create a CTLineRef from the string, and use CTRunGetGlyphs() with
     11        CTRunGetStringIndices() to map from the code points to the glyphs. This approach is
     12        fundamentally incorrect, as it will combine consecutive code points together in the
     13        string if possible to produce a glyph.
     14
     15        The only way WebKit will ever trigger this code path is if we are inspecting a
     16        composite font, first introduced in [1]. These composite fonts are extremely rare
     17        because:
     18        1. None of the preinstalled fonts on either OS X nor iOS are composite fonts,
     19        2. WebKit does not support loading web fonts from composite font files, and
     20        3. WebKit's support only ever existed on OS X (none of the other ports).
     21
     22        In fact, no one I've consulted with has ever seen any of these fonts used in the wild.
     23        The fonts also require a fundamentally broken code path, and add complexity to WebKit.
     24
     25        [1] https://bugs.webkit.org/attachment.cgi?id=134923&action=review
     26
     27        No new tests.
     28
     29        * platform/graphics/Font.h:
     30        * platform/graphics/FontPlatformData.cpp:
     31        (WebCore::FontPlatformData::FontPlatformData): Deleted.
     32        (WebCore::FontPlatformData::operator=): Deleted.
     33        * platform/graphics/FontPlatformData.h:
     34        (WebCore::FontPlatformData::isCompositeFontReference): Deleted.
     35        (WebCore::FontPlatformData::operator==): Deleted.
     36        * platform/graphics/cocoa/FontCocoa.mm:
     37        (WebCore::Font::compositeFontReferenceFont): Deleted.
     38        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     39        (WebCore::FontPlatformData::FontPlatformData): Deleted.
     40        (WebCore::FontPlatformData::setFont): Deleted.
     41        * platform/graphics/mac/GlyphPageMac.cpp:
     42        (WebCore::shouldUseCoreText):
     43        (WebCore::GlyphPage::fill):
     44
    1452015-08-17  Tim Horton  <timothy_horton@apple.com>
    246

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

    r187601 r188566  
    186186
    187187#if USE(APPKIT)
    188     const Font* compositeFontReferenceFont(NSFont *key) const;
    189188    NSFont* getNSFont() const { return m_platformData.nsFont(); }
    190189#endif
    … …  
    285284        RefPtr<Font> uprightOrientation;
    286285        RefPtr<Font> nonSyntheticItalic;
    287 #if USE(APPKIT)
    288         HashMap<NSFont*, RefPtr<Font>> compositeFontReferences;
    289 #endif
    290286    };
    291287

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

    r185200 r188566  
    6666    m_isHashTableDeletedValue = source.m_isHashTableDeletedValue;
    6767    m_isColorBitmapFont = source.m_isColorBitmapFont;
    68     m_isCompositeFontReference = source.m_isCompositeFontReference;
    6968    platformDataInit(source);
    7069}
    … …  
    8382    m_widthVariant = other.m_widthVariant;
    8483    m_isColorBitmapFont = other.m_isColorBitmapFont;
    85     m_isCompositeFontReference = other.m_isCompositeFontReference;
    8684
    8785    return platformDataAssign(other);

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

    r188377 r188566  
    135135    bool syntheticOblique() const { return m_syntheticOblique; }
    136136    bool isColorBitmapFont() const { return m_isColorBitmapFont; }
    137     bool isCompositeFontReference() const { return m_isCompositeFontReference; }
    138137    FontOrientation orientation() const { return m_orientation; }
    139138    FontWidthVariant widthVariant() const { return m_widthVariant; }
    … …  
    176175            && m_syntheticOblique == other.m_syntheticOblique
    177176            && m_isColorBitmapFont == other.m_isColorBitmapFont
    178             && m_isCompositeFontReference == other.m_isCompositeFontReference
    179177            && m_orientation == other.m_orientation
    180178            && m_widthVariant == other.m_widthVariant;
    … …  
    237235
    238236    bool m_isColorBitmapFont { false };
    239     bool m_isCompositeFontReference { false };
    240237    bool m_isHashTableDeletedValue { false };
    241238#if PLATFORM(IOS)

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

    r185842 r188566  
    540540}
    541541
    542 #if USE(APPKIT)
    543 const Font* Font::compositeFontReferenceFont(NSFont *key) const
    544 {
    545     if (!key || CFEqual(adoptCF(CTFontCopyPostScriptName(CTFontRef(key))).get(), CFSTR("LastResort")))
    546         return nullptr;
    547 
    548     if (!m_derivedFontData)
    549         m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
    550 
    551     auto addResult = m_derivedFontData->compositeFontReferences.add(key, nullptr);
    552     if (addResult.isNewEntry) {
    553         NSFont *substituteFont = [key printerFont];
    554 
    555         CTFontSymbolicTraits traits = CTFontGetSymbolicTraits((CTFontRef)substituteFont);
    556         bool syntheticBold = platformData().syntheticBold() && !(traits & kCTFontBoldTrait);
    557         bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
    558 
    559         FontPlatformData substitutePlatform(reinterpret_cast<CTFontRef>(substituteFont), platformData().size(), syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
    560         addResult.iterator->value = Font::create(substitutePlatform, isCustomFont());
    561     }
    562     return addResult.iterator->value.get();
    563 }
    564 #endif
    565 
    566542} // namespace WebCore

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

    r188243 r188566  
    4848    m_font = font;
    4949    m_isColorBitmapFont = CTFontGetSymbolicTraits(font) & kCTFontTraitColorGlyphs;
    50     m_isCompositeFontReference = CTFontGetSymbolicTraits(font) & kCTFontCompositeTrait;
    5150}
    5251
    … …  
    114113    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(m_font.get());
    115114    m_isColorBitmapFont = traits & kCTFontTraitColorGlyphs;
    116     m_isCompositeFontReference = traits & kCTFontCompositeTrait;
    117115   
    118116    m_ctFont = nullptr;

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

    r188377 r188566  
    4646    // every situtation. Returning true from this function in a new situation will require you to explicitly add
    4747    // handling for that situation in the CoreText paths of GlyphPage::fill().
    48     if (fontData->platformData().isCompositeFontReference() || fontData->isSystemFont())
     48    if (fontData->isSystemFont())
    4949        return true;
    5050    if (fontData->platformData().isForTextCombine() || fontData->hasVerticalGlyphs()) {
    … …  
    9191            }
    9292        }
    93     } else if (!fontData->platformData().isCompositeFontReference()) {
     93    } else {
    9494        // Because we know the implementation of shouldUseCoreText(), if the font isn't for text combine and it isn't a system font,
    9595        // we know it must have vertical glyphs.
    … …  
    110110            }
    111111        }
    112     } else {
    113         // FIXME: webkit.org/b/147859 This code is fundamentally broken. A string is not the same as an ordered sequence of codepoints. In particular, strings
    114         // combine adjacent codepoints into grapheme clusters. We should delete this entire else {} block.
    115 
    116         // We ask CoreText for possible vertical variant glyphs
    117         RetainPtr<CFStringRef> string = adoptCF(CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, buffer, bufferLength, kCFAllocatorNull));
    118         RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), fontData->getCFStringAttributes(0, fontData->hasVerticalGlyphs() ? Vertical : Horizontal)));
    119         RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
    120 
    121         CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
    122         CFIndex runCount = CFArrayGetCount(runArray);
    123 
    124         // Initialize glyph entries
    125         for (unsigned index = 0; index < length; ++index)
    126             setGlyphDataForIndex(offset + index, 0, 0);
    127 
    128         Vector<CGGlyph, 512> glyphVector;
    129         Vector<CFIndex, 512> indexVector;
    130         bool done = false;
    131 
    132         RetainPtr<CFTypeRef> fontEqualityObject = fontData->platformData().objectForEqualityCheck();
    133 
    134         for (CFIndex r = 0; r < runCount && !done ; ++r) {
    135             // CTLine could map characters over multiple fonts using its own font fallback list.
    136             // We need to pick runs that use the exact font we need, i.e., fontData->platformData().ctFont().
    137             CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, r));
    138             ASSERT(CFGetTypeID(ctRun) == CTRunGetTypeID());
    139 
    140             CFDictionaryRef attributes = CTRunGetAttributes(ctRun);
    141             CTFontRef runFont = static_cast<CTFontRef>(CFDictionaryGetValue(attributes, kCTFontAttributeName));
    142             bool gotBaseFont = CFEqual(fontEqualityObject.get(), FontPlatformData::objectForEqualityCheck(runFont).get());
    143             if (gotBaseFont || fontData->platformData().isCompositeFontReference()) {
    144                 // This run uses the font we want. Extract glyphs.
    145                 CFIndex glyphCount = CTRunGetGlyphCount(ctRun);
    146                 const CGGlyph* glyphs = CTRunGetGlyphsPtr(ctRun);
    147                 if (!glyphs) {
    148                     glyphVector.resize(glyphCount);
    149                     CTRunGetGlyphs(ctRun, CFRangeMake(0, 0), glyphVector.data());
    150                     glyphs = glyphVector.data();
    151                 }
    152                 const CFIndex* stringIndices = CTRunGetStringIndicesPtr(ctRun);
    153                 if (!stringIndices) {
    154                     indexVector.resize(glyphCount);
    155                     CTRunGetStringIndices(ctRun, CFRangeMake(0, 0), indexVector.data());
    156                     stringIndices = indexVector.data();
    157                 }
    158 
    159                 // When buffer consists of surrogate pairs, CTRunGetStringIndicesPtr and CTRunGetStringIndices
    160                 // place the glyphs at indices corresponding to the first character of each pair.
    161                 ASSERT(!(bufferLength % length) && (bufferLength / length == 1 || bufferLength / length == 2));
    162                 unsigned glyphStep = bufferLength / length;
    163                 if (gotBaseFont) {
    164                     for (CFIndex i = 0; i < glyphCount; ++i) {
    165                         if (stringIndices[i] >= static_cast<CFIndex>(bufferLength)) {
    166                             done = true;
    167                             break;
    168                         }
    169                         if (glyphs[i]) {
    170                             setGlyphDataForIndex(offset + (stringIndices[i] / glyphStep), glyphs[i], fontData);
    171                             haveGlyphs = true;
    172                         }
    173                     }
    174 #if USE(APPKIT)
    175                 } else {
    176                     const Font* runSimple = fontData->compositeFontReferenceFont((NSFont *)runFont);
    177                     if (runSimple) {
    178                         for (CFIndex i = 0; i < glyphCount; ++i) {
    179                             if (stringIndices[i] >= static_cast<CFIndex>(bufferLength)) {
    180                                 done = true;
    181                                 break;
    182                             }
    183                             if (glyphs[i]) {
    184                                 setGlyphDataForIndex(offset + (stringIndices[i] / glyphStep), glyphs[i], runSimple);
    185                                 haveGlyphs = true;
    186                             }
    187                         }
    188                     }
    189 #endif
    190                 }
    191             }
    192         }
    193112    }
    194113

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

    r170774 r188566  
    125125    , m_cgFont(font)
    126126    , m_isColorBitmapFont(false)
    127     , m_isCompositeFontReference(false)
    128127    , m_useGDI(useGDI)
    129128{

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

    r170774 r188566  
    4949#endif
    5050    , m_isColorBitmapFont(false)
    51     , m_isCompositeFontReference(false)
    5251    , m_syntheticBold(bold)
    5352    , m_syntheticOblique(oblique)

  • trunk/Tools/ChangeLog

    r188564 r188566  
     12015-08-17  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [OS X] Remove support for composite fonts
     4        https://bugs.webkit.org/show_bug.cgi?id=147920
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     9        * DumpRenderTree/fonts/SampleFont.sfont: Removed.
     10        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
     11        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
     12        * DumpRenderTree/mac/DumpRenderTree.mm:
     13        (allowedFontFamilySet): Deleted.
     14        (activateTestingFonts): Deleted.
     15        * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
     16        (WTR::allowedFontFamilySet): Deleted.
     17        (WTR::activateFonts): Deleted.
     18        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     19        * WebKitTestRunner/fonts/SampleFont.sfont: Removed.
     20        * WebKitTestRunner/mac/TestControllerMac.mm:
     21        (WTR::allowedFontFamilySet): Deleted.
     22
    1232015-08-17  Jon Honeycutt  <jhoneycutt@apple.com>
    224

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r187886 r188566  
    8585                80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */; };
    8686                8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; };
    87                 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 8CCDA81F151A56550003F937 /* SampleFont.sfont */; };
    8887                9830F31F15C81181005AB206 /* DumpRenderTreeCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9830F31E15C81181005AB206 /* DumpRenderTreeCommon.cpp */; };
    8988                A1158D581892740C0088C17B /* DumpRenderTreeBrowserView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1158D56189273EB0088C17B /* DumpRenderTreeBrowserView.mm */; };
    … …  
    185184                        files = (
    186185                                5DB9AC970F722C3600684641 /* AHEM____.TTF in Copy Font Files */,
    187                                 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */,
    188186                                5DB9AC980F722C3600684641 /* WebKitWeightWatcher100.ttf in Copy Font Files */,
    189187                                5DB9AC990F722C3600684641 /* WebKitWeightWatcher200.ttf in Copy Font Files */,
    … …  
    272270                80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityNotificationHandler.mm; path = mac/AccessibilityNotificationHandler.mm; sourceTree = "<group>"; };
    273271                8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
    274                 8CCDA81F151A56550003F937 /* SampleFont.sfont */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = SampleFont.sfont; path = fonts/SampleFont.sfont; sourceTree = "<group>"; };
    275272                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    276273                9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    613610                        children = (
    614611                                AA7F10C20CB3C1030003BDC9 /* AHEM____.TTF */,
    615                                 8CCDA81F151A56550003F937 /* SampleFont.sfont */,
    616612                                375F09710DAC3CB600C8B4E5 /* WebKitWeightWatcher100.ttf */,
    617613                                375F09720DAC3CB600C8B4E5 /* WebKitWeightWatcher200.ttf */,

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig

    r184209 r188566  
    2929PRODUCT_NAME = DumpRenderTree;
    3030
    31 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
     31EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig

    r184209 r188566  
    2626#include "BaseTarget.xcconfig"
    2727
    28 OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont;
     28OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf;
    2929
    3030OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r188139 r188566  
    360360        @"Hiragino Kaku Gothic Std",
    361361        @"Hiragino Kaku Gothic StdN",
    362         @"Hiragino Maru Gothic Monospaced",
    363362        @"Hiragino Maru Gothic Pro",
    364363        @"Hiragino Maru Gothic ProN",
    … …  
    560559        "WebKitWeightWatcher800.ttf",
    561560        "WebKitWeightWatcher900.ttf",
    562         "SampleFont.sfont",
    563561        0
    564562    };

  • trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm

    r183562 r188566  
    110110        @"Hiragino Kaku Gothic Std",
    111111        @"Hiragino Kaku Gothic StdN",
    112         @"Hiragino Maru Gothic Monospaced",
    113112        @"Hiragino Maru Gothic Pro",
    114113        @"Hiragino Maru Gothic ProN",
    … …  
    301300        "WebKitWeightWatcher800.ttf",
    302301        "WebKitWeightWatcher900.ttf",
    303         "SampleFont.sfont",
    304302        0
    305303    };

  • trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj

    r188157 r188566  
    9090                8097338A14874A5A008156D9 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */; };
    9191                841CC00F181185BF0042E9B6 /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 841CC00D181185BF0042E9B6 /* Options.cpp */; };
    92                 8CCDA823151A570B0003F937 /* SampleFont.sfont in Resources */ = {isa = PBXBuildFile; fileRef = 8CCDA822151A570B0003F937 /* SampleFont.sfont */; };
    9392                A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */; };
    9493                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
    … …  
    231230                841CC00D181185BF0042E9B6 /* Options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Options.cpp; sourceTree = "<group>"; };
    232231                841CC00E181185BF0042E9B6 /* Options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Options.h; sourceTree = "<group>"; };
    233                 8CCDA822151A570B0003F937 /* SampleFont.sfont */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = SampleFont.sfont; path = fonts/SampleFont.sfont; sourceTree = "<group>"; };
    234232                8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
    235233                BC14E4D8120E02D000826C0C /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
    … …  
    540538                                6510A77711EC643800410867 /* AHEM____.TTF */,
    541539                                BC25186311D15D54002EBC01 /* InjectedBundle-Info.plist */,
    542                                 8CCDA822151A570B0003F937 /* SampleFont.sfont */,
    543540                                6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */,
    544541                                6510A77A11EC643800410867 /* WebKitWeightWatcher200.ttf */,
    … …  
    747744                        files = (
    748745                                6510A78211EC643800410867 /* AHEM____.TTF in Resources */,
    749                                 8CCDA823151A570B0003F937 /* SampleFont.sfont in Resources */,
    750746                                6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */,
    751747                                6510A78511EC643800410867 /* WebKitWeightWatcher200.ttf in Resources */,

  • trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r188548 r188566  
    203203        @"Hiragino Kaku Gothic Std",
    204204        @"Hiragino Kaku Gothic StdN",
    205         @"Hiragino Maru Gothic Monospaced",
    206205        @"Hiragino Maru Gothic Pro",
    207206        @"Hiragino Maru Gothic ProN",
Note: See TracChangeset for help on using the changeset viewer.