Changeset 177726 in webkit


Ignore:
Timestamp:
Dec 24, 2014 4:21:52 PM (9 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] WebCoreSystemInterface.h declares two unused symbols
​https://bugs.webkit.org/show_bug.cgi?id=139937

Reviewed by Tim Horton.

  • platform/graphics/FontPlatformData.h: Removed unused typedefs.
  • platform/graphics/mac/FontCustomPlatformData.cpp:

(WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
FontCustomPlatformData constructor.

  • platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.

(WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
parameter and m_atsContainer member variable.

  • platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r177720 r177726  
     12014-12-24  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] WebCoreSystemInterface.h declares two unused symbols
     4        https://bugs.webkit.org/show_bug.cgi?id=139937
     5
     6        Reviewed by Tim Horton.
     7
     8        * platform/graphics/FontPlatformData.h: Removed unused typedefs.
     9
     10        * platform/graphics/mac/FontCustomPlatformData.cpp:
     11        (WebCore::createFontCustomPlatformData): Stop passing always-zero containerRef parameter to
     12        FontCustomPlatformData constructor.
     13
     14        * platform/graphics/mac/FontCustomPlatformData.h: Removed unused typedefs.
     15        (WebCore::FontCustomPlatformData::FontCustomPlatformData): Removed unused container
     16        parameter and m_atsContainer member variable.
     17
     18        * platform/mac/WebCoreSystemInterface.h: Removed unused typedefs and symbols.
     19
    1202014-12-23  Chris Dumez  <cdumez@apple.com>
    221

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

    r177689 r177726  
    5252
    5353typedef const struct __CTFont* CTFontRef;
    54 typedef UInt32 FMFont;
    55 typedef FMFont ATSUFontID;
    56 typedef UInt32 ATSFontRef;
    5754
    5855#endif

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

    r162827 r177726  
    3939std::unique_ptr<FontCustomPlatformData> createFontCustomPlatformData(SharedBuffer& buffer)
    4040{
    41     ATSFontContainerRef containerRef = 0;
    42 
    4341    RetainPtr<CFDataRef> bufferData = buffer.createCFData();
    4442    RetainPtr<CGDataProviderRef> dataProvider = adoptCF(CGDataProviderCreateWithCFData(bufferData.get()));
    … …  
    4846        return nullptr;
    4947
    50     return std::make_unique<FontCustomPlatformData>(containerRef, cgFontRef.get());
     48    return std::make_unique<FontCustomPlatformData>(cgFontRef.get());
    5149}
    5250

  • trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h

    r165676 r177726  
    3131
    3232typedef struct CGFont* CGFontRef;
    33 typedef UInt32 ATSFontContainerRef;
    34 typedef UInt32 ATSFontRef;
    3533
    3634namespace WebCore {
    … …  
    4240    WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
    4341public:
    44     FontCustomPlatformData(ATSFontContainerRef container, CGFontRef cgFont)
    45         : m_atsContainer(container)
    46         , m_cgFont(cgFont)
     42    explicit FontCustomPlatformData(CGFontRef cgFont)
     43        : m_cgFont(cgFont)
    4744    {
    4845    }
    … …  
    5451    static bool supportsFormat(const String&);
    5552
    56     ATSFontContainerRef m_atsContainer;
    5753    RetainPtr<CGFontRef> m_cgFont;
    5854};

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r176164 r177726  
    6060typedef struct _NSRange NSRange;
    6161typedef double NSTimeInterval;
    62 
    63 typedef UInt32 FMFont;
    64 typedef FMFont ATSUFontID;
    65 typedef UInt16 ATSGlyphRef;
    6662#endif
    6763
    … …  
    158154#endif
    159155#if !PLATFORM(IOS)
    160 extern ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
    161156extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
    162157#endif
    … …  
    223218extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
    224219
    225 extern BOOL (*wkUseSharedMediaUI)();
    226 
    227220#if !PLATFORM(IOS)
    228221extern void* wkGetHyphenationLocationBeforeIndex;
Note: See TracChangeset for help on using the changeset viewer.