Changeset 95394 in webkit


Ignore:
Timestamp:
Sep 18, 2011, 10:27:31 AM (14 years ago)
Author:
mitz@apple.com
Message:

Try to fix the Chromium Mac build after r95391.

  • WebCore.gypi: Updated for the renaming of ComplexTextController.cpp.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • platform/graphics/Font.h: Changed #if directives to include the Chromium Mac port.
  • platform/graphics/SimpleFontData.h: Ditto.
  • platform/graphics/mac/ComplexTextControllerCoreText.cpp: Changed the filename extension of this

Objective-C++ file to .mm.

  • platform/graphics/mac/ComplexTextControllerCoreText.mm: Copied from Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp.
Location:
trunk/Source/WebCore
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r95393 r95394  
     12011-09-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Try to fix the Chromium Mac build after r95391.
     4
     5        * WebCore.gypi: Updated for the renaming of ComplexTextController.cpp.
     6        * WebCore.xcodeproj/project.pbxproj: Ditto.
     7        * platform/graphics/Font.h: Changed #if directives to include the Chromium Mac port.
     8        * platform/graphics/SimpleFontData.h: Ditto.
     9        * platform/graphics/mac/ComplexTextControllerCoreText.cpp: Changed the filename extension of this
     10        Objective-C++ file to .mm.
     11        * platform/graphics/mac/ComplexTextControllerCoreText.mm: Copied from Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp.
     12
    1132011-09-18  Dan Bernstein  <mitz@apple.com>
    214

  • trunk/Source/WebCore/WebCore.gypi

    r95372 r95394  
    37033703            'platform/graphics/mac/ComplexTextController.h',
    37043704            'platform/graphics/mac/ComplexTextControllerATSUI.cpp',
    3705             'platform/graphics/mac/ComplexTextControllerCoreText.cpp',
     3705            'platform/graphics/mac/ComplexTextControllerCoreText.mm',
    37063706            'platform/graphics/mac/FloatPointMac.mm',
    37073707            'platform/graphics/mac/FloatRectMac.mm',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r95391 r95394  
    873873                37C236111097EE7700EF9F72 /* ComplexTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C2360F1097EE7700EF9F72 /* ComplexTextController.h */; };
    874874                37C238211098C84200EF9F72 /* ComplexTextControllerATSUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37C2381F1098C84200EF9F72 /* ComplexTextControllerATSUI.cpp */; };
    875                 37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.cpp */; };
     875                37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.mm */; };
    876876                37C28A6810F659CC008C7813 /* TypesettingFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C28A6710F659CC008C7813 /* TypesettingFeatures.h */; settings = {ATTRIBUTES = (Private, ); }; };
    877877                37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */; };
    … …  
    74467446                37C2360F1097EE7700EF9F72 /* ComplexTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexTextController.h; sourceTree = "<group>"; };
    74477447                37C2381F1098C84200EF9F72 /* ComplexTextControllerATSUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextControllerATSUI.cpp; sourceTree = "<group>"; };
    7448                 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = ComplexTextControllerCoreText.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     7448                37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ComplexTextControllerCoreText.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
    74497449                37C28A6710F659CC008C7813 /* TypesettingFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypesettingFeatures.h; sourceTree = "<group>"; };
    74507450                37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringKeyedMRUCache.h; sourceTree = "<group>"; };
    … …  
    1821118211                                37C2360F1097EE7700EF9F72 /* ComplexTextController.h */,
    1821218212                                37C2381F1098C84200EF9F72 /* ComplexTextControllerATSUI.cpp */,
    18213                                 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.cpp */,
     18213                                37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.mm */,
    1821418214                                B275354B0B053814002CE64F /* FloatPointMac.mm */,
    1821518215                                B275354C0B053814002CE64F /* FloatRectMac.mm */,
    … …  
    2397723977                                37C236101097EE7700EF9F72 /* ComplexTextController.cpp in Sources */,
    2397823978                                37C238211098C84200EF9F72 /* ComplexTextControllerATSUI.cpp in Sources */,
    23979                                 37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.cpp in Sources */,
     23979                                37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.mm in Sources */,
    2398023980                                316FE1150E6E1DA700BF6088 /* CompositeAnimation.cpp in Sources */,
    2398123981                                93309DDC099E64920056E581 /* CompositeEditCommand.cpp in Sources */,

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

    r95391 r95394  
    140140    const FontData* fontDataAt(unsigned) const;
    141141    GlyphData glyphDataForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const;
    142 #if PLATFORM(MAC)
     142#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    143143    const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
    144144#endif

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

    r95391 r95394  
    178178#endif
    179179
    180 #if PLATFORM(MAC)
     180#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    181181    bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
    182182#endif
    … …  
    295295#endif
    296296
    297 #if PLATFORM(MAC)
     297#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    298298    mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
    299299#endif
Note: See TracChangeset for help on using the changeset viewer.