Changeset 180367 in webkit


Ignore:
Timestamp:
Feb 19, 2015 2:56:44 PM (9 years ago)
Author:
ddkilzer@apple.com
Message:

Rename SOFT_LINK_FUNCTION_{DECL,IMPL}() to SOFT_LINK_FUNCTION_{HEADER,SOURCE}()

Rubber-stamped by Brent Fulgham.

"HEADER" and "SOURCE" seem clearer than "DECL" and "IMPL", and
Brent agreed when I talked to him in person.

  • platform/cf/CoreMediaSoftLink.cpp:
  • platform/cf/CoreMediaSoftLink.h:
  • platform/mac/SoftLinking.h:
  • platform/win/SoftLinking.h:
  • Do the rename.
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r180366 r180367  
     12015-02-19  David Kilzer  <ddkilzer@apple.com>
     2
     3        Rename SOFT_LINK_FUNCTION_{DECL,IMPL}() to SOFT_LINK_FUNCTION_{HEADER,SOURCE}()
     4
     5        Rubber-stamped by Brent Fulgham.
     6
     7        "HEADER" and "SOURCE" seem clearer than "DECL" and "IMPL", and
     8        Brent agreed when I talked to him in person.
     9
     10        * platform/cf/CoreMediaSoftLink.cpp:
     11        * platform/cf/CoreMediaSoftLink.h:
     12        * platform/mac/SoftLinking.h:
     13        * platform/win/SoftLinking.h:
     14        - Do the rename.
     15
    1162015-02-19  David Kilzer  <ddkilzer@apple.com>
    217

  • trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp

    r180366 r180367  
    3535}
    3636
    37 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
    38 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
    39 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
    40 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
    41 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
     37SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
     38SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
     39SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
     40SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
     41SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
    4242
    4343#if PLATFORM(COCOA)
    44 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
    45 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
    46 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
    47 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
    48 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
     44SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
     45SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
     46SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
     47SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
     48SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
    4949#endif // PLATFORM(COCOA)
    5050
    5151#if PLATFORM(WIN)
    52 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
    53 SOFT_LINK_FUNCTION_IMPL(CoreMedia, CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
     52SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
     53SOFT_LINK_FUNCTION_SOURCE(CoreMedia, CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
    5454#endif // PLATFORM(WIN)
    5555

  • trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h

    r180366 r180367  
    3232#include <CoreMedia/CoreMedia.h>
    3333
    34 SOFT_LINK_FUNCTION_DECL(CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
     34SOFT_LINK_FUNCTION_HEADER(CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
    3535#define CMTimeCompare softLink_CMTimeCompare
    36 SOFT_LINK_FUNCTION_DECL(CMTimeGetSeconds, Float64, (CMTime time), (time))
     36SOFT_LINK_FUNCTION_HEADER(CMTimeGetSeconds, Float64, (CMTime time), (time))
    3737#define CMTimeGetSeconds softLink_CMTimeGetSeconds
    38 SOFT_LINK_FUNCTION_DECL(CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
     38SOFT_LINK_FUNCTION_HEADER(CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
    3939#define CMTimeMake softLink_CMTimeMake
    40 SOFT_LINK_FUNCTION_DECL(CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
     40SOFT_LINK_FUNCTION_HEADER(CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
    4141#define CMTimeMakeWithSeconds softLink_CMTimeMakeWithSeconds
    42 SOFT_LINK_FUNCTION_DECL(CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
     42SOFT_LINK_FUNCTION_HEADER(CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range))
    4343#define CMTimeRangeGetEnd softLink_CMTimeRangeGetEnd
    4444
    4545#if PLATFORM(COCOA)
    4646
    47 SOFT_LINK_FUNCTION_DECL(CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
     47SOFT_LINK_FUNCTION_HEADER(CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ());
    4848#define CMNotificationCenterGetDefaultLocalCenter softLink_CMNotificationCenterGetDefaultLocalCenter
    49 SOFT_LINK_FUNCTION_DECL(CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
     49SOFT_LINK_FUNCTION_HEADER(CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags))
    5050#define CMNotificationCenterAddListener softLink_CMNotificationCenterAddListener
    51 SOFT_LINK_FUNCTION_DECL(CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
     51SOFT_LINK_FUNCTION_HEADER(CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object))
    5252#define CMNotificationCenterRemoveListener softLink_CMNotificationCenterRemoveListener
    53 SOFT_LINK_FUNCTION_DECL(CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
     53SOFT_LINK_FUNCTION_HEADER(CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
    5454#define CMTimebaseGetTime softLink_CMTimebaseGetTime
    55 SOFT_LINK_FUNCTION_DECL(CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
     55SOFT_LINK_FUNCTION_HEADER(CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator))
    5656#define CMTimeCopyAsDictionary softLink_CMTimeCopyAsDictionary
    5757
    … …  
    6060#if PLATFORM(WIN)
    6161
    62 SOFT_LINK_FUNCTION_DECL(CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
     62SOFT_LINK_FUNCTION_HEADER(CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
    6363#define CMTimeAdd softLink_CMTimeAdd
    64 SOFT_LINK_FUNCTION_DECL(CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
     64SOFT_LINK_FUNCTION_HEADER(CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
    6565#define CMTimeMakeFromDictionary softLink_CMTimeMakeFromDictionary
    6666

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

    r180287 r180367  
    110110    }
    111111
    112 #define SOFT_LINK_FUNCTION_DECL(functionName, resultType, parameterDeclarations, parameterNames) \
     112#define SOFT_LINK_FUNCTION_HEADER(functionName, resultType, parameterDeclarations, parameterNames) \
    113113    WTF_EXTERN_C_BEGIN \
    114114    resultType functionName parameterDeclarations; \
    … …  
    122122    }
    123123
    124 #define SOFT_LINK_FUNCTION_IMPL(framework, functionName, resultType, parameterDeclarations, parameterNames) \
     124#define SOFT_LINK_FUNCTION_SOURCE(framework, functionName, resultType, parameterDeclarations, parameterNames) \
    125125    WTF_EXTERN_C_BEGIN \
    126126    resultType functionName parameterDeclarations; \

  • trunk/Source/WebCore/platform/win/SoftLinking.h

    r180287 r180367  
    117117    }
    118118
    119 #define SOFT_LINK_FUNCTION_DECL(functionName, resultType, parameterDeclarations, parameterNames) \
     119#define SOFT_LINK_FUNCTION_HEADER(functionName, resultType, parameterDeclarations, parameterNames) \
    120120    namespace WebCore { \
    121121    extern resultType(__cdecl*softLink##functionName) parameterDeclarations; \
    … …  
    126126    }
    127127
    128 #define SOFT_LINK_FUNCTION_IMPL(library, functionName, resultType, parameterDeclarations, parameterNames) \
     128#define SOFT_LINK_FUNCTION_SOURCE(library, functionName, resultType, parameterDeclarations, parameterNames) \
    129129    namespace WebCore { \
    130130    static resultType __cdecl init##functionName parameterDeclarations; \
Note: See TracChangeset for help on using the changeset viewer.