Changeset 112771 in webkit


Ignore:
Timestamp:
Mar 30, 2012 9:01:28 PM (12 years ago)
Author:
mitz@apple.com
Message:

Reverted r112767, because it caused many vertical text tests to fail.

Source/WebCore:

  • WebCore.exp.in:
  • platform/graphics/FontPlatformData.cpp:

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

  • platform/graphics/FontPlatformData.h:

(WebCore::FontPlatformData::FontPlatformData):
(FontPlatformData):
(WebCore::FontPlatformData::isColorBitmapFont):
(WebCore::FontPlatformData::hash):
(WebCore::FontPlatformData::operator==):

  • platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):

  • platform/graphics/SimpleFontData.h:

(SimpleFontData):
(DerivedFontData):

  • platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::setFont):

  • platform/graphics/mac/FontCacheMac.mm:

(WebCore::FontCache::createFontPlatformData):

  • platform/graphics/mac/GlyphPageTreeNodeMac.cpp:

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

  • platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore):

Tools:

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

(allowedFontFamilySet):
(activateTestingFonts):

  • WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:

(WTR::allowedFontFamilySet):
(WTR::activateFonts):

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

LayoutTests:

  • fast/text/international/text-spliced-font.html: Removed.
  • platform/mac/fast/text/international/text-spliced-font-expected.png: Removed.
  • platform/mac/fast/text/international/text-spliced-font-expected.txt: Removed.
Location:
trunk
Files:
5 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r112769 r112771  
     12012-03-30  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted r112767, because it caused many vertical text tests to fail.
     4
     5        * fast/text/international/text-spliced-font.html: Removed.
     6        * platform/mac/fast/text/international/text-spliced-font-expected.png: Removed.
     7        * platform/mac/fast/text/international/text-spliced-font-expected.txt: Removed.
     8
    192012-03-30  Dirk Schulze  <krit@webkit.org>
    210

  • trunk/Source/WebCore/ChangeLog

    r112770 r112771  
     12012-03-30  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted r112767, because it caused many vertical text tests to fail.
     4
     5        * WebCore.exp.in:
     6        * platform/graphics/FontPlatformData.cpp:
     7        (WebCore::FontPlatformData::FontPlatformData):
     8        (WebCore::FontPlatformData::operator=):
     9        * platform/graphics/FontPlatformData.h:
     10        (WebCore::FontPlatformData::FontPlatformData):
     11        (FontPlatformData):
     12        (WebCore::FontPlatformData::isColorBitmapFont):
     13        (WebCore::FontPlatformData::hash):
     14        (WebCore::FontPlatformData::operator==):
     15        * platform/graphics/SimpleFontData.cpp:
     16        (WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):
     17        * platform/graphics/SimpleFontData.h:
     18        (SimpleFontData):
     19        (DerivedFontData):
     20        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     21        (WebCore::FontPlatformData::FontPlatformData):
     22        (WebCore::FontPlatformData::setFont):
     23        * platform/graphics/mac/FontCacheMac.mm:
     24        (WebCore::FontCache::createFontPlatformData):
     25        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
     26        (WebCore::shouldUseCoreText):
     27        (WebCore::GlyphPage::fill):
     28        * platform/graphics/mac/SimpleFontDataMac.mm:
     29        (WebCore):
     30
    1312012-03-30  Dan Bernstein  <mitz@apple.com>
    232

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

    r112767 r112771  
    477477__ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
    478478__ZN7WebCore16FontFallbackList15releaseFontDataEv
    479 __ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
    480 __ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
     479__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbNS_15FontOrientationENS_15TextOrientationENS_16FontWidthVariantE
    481480__ZN7WebCore16FontPlatformDataD1Ev
    482481__ZN7WebCore16HTMLInputElement13setAutofilledEb

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

    r112767 r112771  
    4040    , m_widthVariant(source.m_widthVariant)
    4141    , m_isColorBitmapFont(source.m_isColorBitmapFont)
    42     , m_isCompositeFontReference(source.m_isCompositeFontReference)
    43 #if OS(DARWIN)
    44     , m_isPrinterFont(source.m_isPrinterFont)
    45 #endif
    4642{
    4743    platformDataInit(source);
    … …  
    6157    m_widthVariant = other.m_widthVariant;
    6258    m_isColorBitmapFont = other.m_isColorBitmapFont;
    63     m_isCompositeFontReference = other.m_isCompositeFontReference;
    64 #if OS(DARWIN)
    65     m_isPrinterFont = other.m_isPrinterFont;
    66 #endif
    6759
    6860    return platformDataAssign(other);

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

    r112767 r112771  
    118118#endif
    119119        , m_isColorBitmapFont(false)
    120         , m_isCompositeFontReference(false)
    121 #if OS(DARWIN)
    122         , m_isPrinterFont(false)
    123 #endif
    124120#if PLATFORM(WIN)
    125121        , m_useGDI(false)
    … …  
    144140#endif
    145141        , m_isColorBitmapFont(false)
    146         , m_isCompositeFontReference(false)
    147 #if OS(DARWIN)
    148         , m_isPrinterFont(false)
    149 #endif
    150142#if PLATFORM(WIN)
    151143        , m_useGDI(false)
    … …  
    173165#endif
    174166        , m_isColorBitmapFont(false)
    175         , m_isCompositeFontReference(false)
    176 #if OS(DARWIN)
    177         , m_isPrinterFont(false)
    178 #endif
    179167#if PLATFORM(WIN)
    180168        , m_useGDI(false)
    … …  
    184172
    185173#if OS(DARWIN)
    186     FontPlatformData(NSFont*, float size, bool isPrinterFont = false, bool syntheticBold = false, bool syntheticOblique = false,
    187                      FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
     174    FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
     175                     TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
    188176#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
    189177    FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    … …  
    198186        , m_cgFont(cgFont)
    199187        , m_isColorBitmapFont(false)
    200         , m_isCompositeFontReference(false)
    201         , m_isPrinterFont(false)
    202188    {
    203189    }
    … …  
    242228    bool syntheticOblique() const { return m_syntheticOblique; }
    243229    bool isColorBitmapFont() const { return m_isColorBitmapFont; }
    244     bool isCompositeFontReference() const { return m_isCompositeFontReference; }
    245 #if OS(DARWIN)
    246     bool isPrinterFont() const { return m_isPrinterFont; }
    247 #endif
    248230    FontOrientation orientation() const { return m_orientation; }
    249231    TextOrientation textOrientation() const { return m_textOrientation; }
    … …  
    264246        ASSERT(m_font || !m_cgFont);
    265247#endif
    266         uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_isPrinterFont << 4 | m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
     248        uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
    267249        return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
    268250#elif USE(CAIRO)
    … …  
    280262            && m_syntheticOblique == other.m_syntheticOblique
    281263            && m_isColorBitmapFont == other.m_isColorBitmapFont
    282             && m_isCompositeFontReference == other.m_isCompositeFontReference
    283 #if OS(DARWIN)
    284             && m_isPrinterFont == other.m_isPrinterFont
    285 #endif
    286264            && m_orientation == other.m_orientation
    287265            && m_textOrientation == other.m_textOrientation
    … …  
    362340
    363341    bool m_isColorBitmapFont;
    364     bool m_isCompositeFontReference;
    365 #if OS(DARWIN)
    366     bool m_isPrinterFont;
    367 #endif
    368342
    369343#if PLATFORM(WIN)

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

    r112767 r112771  
    218218    if (uprightOrientation)
    219219        GlyphPageTreeNode::pruneTreeCustomFontData(uprightOrientation.get());
    220 #if PLATFORM(MAC)
    221     if (compositeFontReferences) {
    222         CFDictionaryRef dictionary = CFDictionaryRef(compositeFontReferences.get());
    223         CFIndex count = CFDictionaryGetCount(dictionary);
    224         if (count > 0) {
    225             Vector<SimpleFontData*, 2> stash(count);
    226             SimpleFontData** fonts = stash.data();
    227             CFDictionaryGetKeysAndValues(dictionary, 0, (const void **)fonts);
    228             while (count-- > 0 && *fonts) {
    229                 OwnPtr<SimpleFontData> afont = adoptPtr(*fonts++);
    230                 GlyphPageTreeNode::pruneTreeCustomFontData(afont.get());
    231             }
    232         }
    233     }
    234 #endif
    235220}
    236221

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

    r112770 r112771  
    166166
    167167#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    168     const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
    169168    NSFont* getNSFont() const { return m_platformData.font(); }
    170169#elif (PLATFORM(WX) && OS(DARWIN))
    … …  
    265264        OwnPtr<SimpleFontData> verticalRightOrientation;
    266265        OwnPtr<SimpleFontData> uprightOrientation;
    267 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    268         mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
    269 #endif
    270        
     266
    271267    private:
    272268        DerivedFontData(bool custom)

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

    r112767 r112771  
    4242#endif  // PLATFORM(MAC)
    4343
    44 FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
     44FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    4545                                   TextOrientation textOrientation, FontWidthVariant widthVariant)
    4646    : m_syntheticBold(syntheticBold)
    … …  
    5151    , m_widthVariant(widthVariant)
    5252    , m_font(nsFont)
    53     , m_isColorBitmapFont(false)
    54     , m_isCompositeFontReference(false)
    55     , m_isPrinterFont(isPrinterFont)
    56 {
    57     ASSERT_ARG(nsFont, nsFont);
    58 
    59     CGFontRef cgFont = 0;
    60     loadFont(nsFont, size, m_font, cgFont);
    61    
    6253#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    6354    // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might
    6455    // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont().
    65     {
    66         CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
    67         m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
    68 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(IOS)
    69         m_isCompositeFontReference = traits & kCTFontCompositeTrait;
    70 #endif
    71     }
    72 #endif
     56    , m_isColorBitmapFont(CTFontGetSymbolicTraits(toCTFontRef(nsFont)) & kCTFontColorGlyphsTrait)
     57#else
     58    , m_isColorBitmapFont(false)
     59#endif
     60{
     61    ASSERT_ARG(nsFont, nsFont);
     62
     63    CGFontRef cgFont = 0;
     64    loadFont(nsFont, size, m_font, cgFont);
    7365
    7466    if (m_font)
    … …  
    150142    m_cgFont.adoptCF(cgFont);
    151143#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    152     {
    153         CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
    154         m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
    155 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
    156         m_isCompositeFontReference = traits & kCTFontCompositeTrait;
    157 #endif
    158     }
     144    m_isColorBitmapFont = CTFontGetSymbolicTraits(toCTFontRef(m_font)) & kCTFontColorGlyphsTrait;
    159145#endif
    160146    m_CTFont = 0;

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

    r112767 r112771  
    231231    bool syntheticOblique = (traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
    232232
    233     return new FontPlatformData(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.textOrientation(), fontDescription.widthVariant());
     233    return new FontPlatformData(platformFont, size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.textOrientation(), fontDescription.widthVariant());
    234234}
    235235

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

    r112767 r112771  
    3939static bool shouldUseCoreText(UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
    4040{
    41     if (fontData->platformData().isCompositeFontReference())
    42         return true;
    4341    if (fontData->platformData().widthVariant() != RegularWidth || fontData->hasVerticalGlyphs()) {
    4442        // Ideographs don't have a vertical variant or width variants.
    … …  
    6765            }
    6866        }
    69     } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
    70                : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
     67    } else if ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
     68        : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)) {
    7169        for (unsigned i = 0; i < length; ++i) {
    7270            if (!glyphs[i])
    … …  
    108106            RetainPtr<CGFontRef> runCGFont(AdoptCF, CTFontCopyGraphicsFont(runFont, 0));
    109107            // Use CGFont here as CFEqual for CTFont counts all attributes for font.
    110             bool gotBaseFont = CFEqual(cgFont.get(), runCGFont.get());
    111             if (gotBaseFont || fontData->platformData().isCompositeFontReference()) {
     108            if (CFEqual(cgFont.get(), runCGFont.get())) {
    112109                // This run uses the font we want. Extract glyphs.
    113110                CFIndex glyphCount = CTRunGetGlyphCount(ctRun);
    … …  
    125122                }
    126123
    127                 if (gotBaseFont) {
    128                     for (CFIndex i = 0; i < glyphCount; ++i) {
    129                         if (stringIndices[i] >= static_cast<CFIndex>(length)) {
    130                             done = true;
    131                             break;
    132                         }
    133                         if (glyphs[i]) {
    134                             setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], fontData);
    135                             haveGlyphs = true;
    136                         }
     124                for (CFIndex i = 0; i < glyphCount; ++i) {
     125                    if (stringIndices[i] >= static_cast<CFIndex>(length)) {
     126                        done = true;
     127                        break;
    137128                    }
    138                 } else {
    139                     const SimpleFontData* runSimple = fontData->getCompositeFontReferenceFontData((NSFont *)runFont);
    140                     if (runSimple) {
    141                         for (CFIndex i = 0; i < glyphCount; ++i) {
    142                             if (stringIndices[i] >= static_cast<CFIndex>(length)) {
    143                                 done = true;
    144                                 break;
    145                             }
    146                             if (glyphs[i]) {
    147                                 setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], runSimple);
    148                                 haveGlyphs = true;
    149                             }
    150                         }
     129                    if (glyphs[i]) {
     130                        setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], fontData);
     131                        haveGlyphs = true;
    151132                    }
    152133                }

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

    r112767 r112771  
    109109#endif // __LP64__
    110110#endif // !ERROR_DISABLED
    111 
    112 const SimpleFontData* SimpleFontData::getCompositeFontReferenceFontData(NSFont *key) const
    113 {
    114     if (key && !CFEqual(RetainPtr<CFStringRef>(AdoptCF, CTFontCopyPostScriptName(CTFontRef(key))).get(), CFSTR("LastResort"))) {
    115         if (!m_derivedFontData)
    116             m_derivedFontData = DerivedFontData::create(isCustomFont());
    117         if (!m_derivedFontData->compositeFontReferences)
    118             m_derivedFontData->compositeFontReferences.adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, NULL));
    119         else {
    120             const SimpleFontData* found = static_cast<const SimpleFontData*>(CFDictionaryGetValue(m_derivedFontData->compositeFontReferences.get(), static_cast<const void *>(key)));
    121             if (found)
    122                 return found;
    123         }
    124         if (CFMutableDictionaryRef dictionary = m_derivedFontData->compositeFontReferences.get()) {
    125             bool isUsingPrinterFont = platformData().isPrinterFont();
    126             NSFont *substituteFont = isUsingPrinterFont ? [key printerFont] : [key screenFont];
    127 
    128             CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(substituteFont));
    129             bool syntheticBold = platformData().syntheticBold() && !(traits & kCTFontBoldTrait);
    130             bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
    131 
    132             FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().textOrientation(), platformData().widthVariant());
    133             SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont());
    134             if (value) {
    135                 CFDictionaryAddValue(dictionary, key, value);
    136                 return value;
    137             }
    138         }
    139     }
    140     return 0;
    141 }
    142111
    143112void SimpleFontData::platformInit()

  • trunk/Tools/ChangeLog

    r112767 r112771  
    1 2012-03-30  Tony Tseung  <tseung@apple.com>
    2 
    3         Composite Font References is a new established standard (ISO/IEC 14496-28:2012) for specifying
    4         composite fonts from existing physical fonts.
    5         <rdar://problem/10717370>
    6         https://bugs.webkit.org/show_bug.cgi?id=82810
    7            
    8         A new test font of this kind as been added to the test tools for running the webkit-tests
    9 
    10         Reviewed by Dan Bernstein.
     12012-03-30  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted r112767, because it caused many vertical text tests to fail.
    114
    125        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
    13         Added new dependency SampleFont.sfont
    14        
    15         * DumpRenderTree/fonts/SampleFont.sfont: Added.
    16        
     6        * DumpRenderTree/fonts/SampleFont.sfont: Removed.
    177        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
    188        * DumpRenderTree/mac/DumpRenderTree.mm:
    199        (allowedFontFamilySet):
    20         Added the Composite Font Referene sample font "Hiragino Maru Gothic Monospaced" entry to the fonts white-list
    21        
    2210        (activateTestingFonts):
    23         Added the registration of the Composite Font Referene sample font
    24        
    2511        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
    2612        (WTR::allowedFontFamilySet):
    27         Added the Composite Font Referene sample font "Hiragino Maru Gothic Monospaced" entry to the fonts white-list
    28 
    2913        (WTR::activateFonts):
    30         Added the registration of the Composite Font Referene sample font
    31 
    3214        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
    33         Added new dependency SampleFont.sfont
    34 
    35         * WebKitTestRunner/fonts/SampleFont.sfont: Added.
     15        * WebKitTestRunner/fonts/SampleFont.sfont: Removed.
    3616
    37172012-03-30  Malcolm MacLeod  <malcolm.macleod@tshwanedje.com>

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

    r112767 r112771  
    8686                80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */; };
    8787                8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; };
    88                 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 8CCDA81F151A56550003F937 /* SampleFont.sfont */; };
    8988                9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; };
    9089                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
    … …  
    205204                        dstSubfolderSpec = 7;
    206205                        files = (
    207                                 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */,
    208206                                5DB9AC970F722C3600684641 /* AHEM____.TTF in Copy Font Files */,
    209207                                5DB9AC980F722C3600684641 /* WebKitWeightWatcher100.ttf in Copy Font Files */,
    … …  
    278276                80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityNotificationHandler.mm; path = mac/AccessibilityNotificationHandler.mm; sourceTree = "<group>"; };
    279277                8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; };
    280                 8CCDA81F151A56550003F937 /* SampleFont.sfont */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = SampleFont.sfont; path = fonts/SampleFont.sfont; sourceTree = "<group>"; };
    281278                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    282279                9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    595592                                375F09780DAC3CB600C8B4E5 /* WebKitWeightWatcher800.ttf */,
    596593                                375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */,
    597                                 8CCDA81F151A56550003F937 /* SampleFont.sfont */,
    598594                        );
    599595                        name = Resources;

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

    r112767 r112771  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 OTHER_LDFLAGS = -sectcreate __DATA Ahem qt/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
     24OTHER_LDFLAGS = -sectcreate __DATA Ahem qt/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
    2525LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
    2626PRODUCT_NAME = DumpRenderTree

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

    r112767 r112771  
    287287        @"Hiragino Kaku Gothic Std",
    288288        @"Hiragino Kaku Gothic StdN",
    289         @"Hiragino Maru Gothic Monospaced",
    290289        @"Hiragino Maru Gothic Pro",
    291290        @"Hiragino Maru Gothic ProN",
    … …  
    419418        "WebKitWeightWatcher800.ttf",
    420419        "WebKitWeightWatcher900.ttf",
    421 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
    422         "SampleFont.sfont",
    423 #endif
    424420        0
    425421    };

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm

    r112767 r112771  
    104104        @"Hiragino Kaku Gothic Std",
    105105        @"Hiragino Kaku Gothic StdN",
    106         @"Hiragino Maru Gothic Monospaced",
    107106        @"Hiragino Maru Gothic Pro",
    108107        @"Hiragino Maru Gothic ProN",
    … …  
    235234        "WebKitWeightWatcher800.ttf",
    236235        "WebKitWeightWatcher900.ttf",
    237 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
    238         "SampleFont.sfont",
    239 #endif
    240236        0
    241237    };

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

    r112767 r112771  
    5353                8034C6621487636400AC32E9 /* AccessibilityControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */; };
    5454                8097338A14874A5A008156D9 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */; };
    55                 8CCDA823151A570B0003F937 /* SampleFont.sfont in Resources */ = {isa = PBXBuildFile; fileRef = 8CCDA822151A570B0003F937 /* SampleFont.sfont */; };
    5655                A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */; };
    5756                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
    … …  
    152151                8097338814874A5A008156D9 /* AccessibilityNotificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AccessibilityNotificationHandler.h; path = mac/AccessibilityNotificationHandler.h; sourceTree = "<group>"; };
    153152                8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityNotificationHandler.mm; path = mac/AccessibilityNotificationHandler.mm; sourceTree = "<group>"; };
    154                 8CCDA822151A570B0003F937 /* SampleFont.sfont */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = SampleFont.sfont; path = fonts/SampleFont.sfont; sourceTree = "<group>"; };
    155153                8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
    156154                BC14E4D8120E02D000826C0C /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
    … …  
    365363                                6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */,
    366364                                6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */,
    367                                 8CCDA822151A570B0003F937 /* SampleFont.sfont */,
    368365                        );
    369366                        name = Resources;
    … …  
    531528                                6510A78B11EC643800410867 /* WebKitWeightWatcher800.ttf in Resources */,
    532529                                6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */,
    533                                 8CCDA823151A570B0003F937 /* SampleFont.sfont in Resources */,
    534530                        );
    535531                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.