Index: Source/core/platform/mac/WebCoreSystemInterface.h |
diff --git a/Source/core/platform/mac/WebCoreSystemInterface.h b/Source/core/platform/mac/WebCoreSystemInterface.h |
index 61416dbaa4a263c131b3cdd78949267334eeb40a..c172367c29e20a063b2ba26a482e68b84596bcd5 100644 |
--- a/Source/core/platform/mac/WebCoreSystemInterface.h |
+++ b/Source/core/platform/mac/WebCoreSystemInterface.h |
@@ -28,34 +28,18 @@ |
#include <objc/objc.h> |
-typedef const struct __CFString * CFStringRef; |
-typedef const struct __CFNumber * CFNumberRef; |
typedef const struct __CFDictionary * CFDictionaryRef; |
-typedef struct CGPoint CGPoint; |
typedef struct CGSize CGSize; |
typedef struct CGRect CGRect; |
typedef struct CGAffineTransform CGAffineTransform; |
typedef struct CGContext *CGContextRef; |
-typedef struct CGImage *CGImageRef; |
-typedef struct CGColor *CGColorRef; |
typedef struct CGFont *CGFontRef; |
-typedef struct CGColorSpace *CGColorSpaceRef; |
-typedef struct CGPattern *CGPatternRef; |
-typedef struct CGPath *CGMutablePathRef; |
typedef unsigned short CGGlyph; |
-typedef struct __CFReadStream * CFReadStreamRef; |
-typedef struct __CFRunLoop * CFRunLoopRef; |
-typedef struct __CFHTTPMessage *CFHTTPMessageRef; |
-typedef struct _CFURLResponse *CFURLResponseRef; |
-typedef const struct _CFURLRequest *CFURLRequestRef; |
+ |
typedef const struct __CTFont * CTFontRef; |
typedef const struct __CTLine * CTLineRef; |
-typedef const struct __CTTypesetter * CTTypesetterRef; |
-typedef const struct __AXUIElement *AXUIElementRef; |
typedef struct _NSRange NSRange; |
-typedef UInt32 FMFont; |
-typedef FMFont ATSUFontID; |
typedef UInt16 ATSGlyphRef; |
#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES |
@@ -66,233 +50,26 @@ typedef struct _NSPoint NSPoint; |
typedef struct _NSRect NSRect; |
#endif |
-OBJC_CLASS AVAsset; |
-OBJC_CLASS CALayer; |
-OBJC_CLASS NSArray; |
OBJC_CLASS NSButtonCell; |
-OBJC_CLASS NSControl; |
-OBJC_CLASS NSCursor; |
-OBJC_CLASS NSData; |
-OBJC_CLASS NSDate; |
-OBJC_CLASS NSEvent; |
OBJC_CLASS NSFont; |
-OBJC_CLASS NSHTTPCookie; |
-OBJC_CLASS NSImage; |
-OBJC_CLASS NSMenu; |
-OBJC_CLASS NSMutableURLRequest; |
OBJC_CLASS NSString; |
-OBJC_CLASS NSTextFieldCell; |
-OBJC_CLASS NSURL; |
-OBJC_CLASS NSURLConnection; |
-OBJC_CLASS NSURLRequest; |
-OBJC_CLASS NSURLResponse; |
-OBJC_CLASS NSView; |
-OBJC_CLASS NSWindow; |
-OBJC_CLASS QTMovie; |
-OBJC_CLASS QTMovieView; |
-OBJC_CLASS WebFilterEvaluator; |
extern "C" { |
// In alphabetical order. |
extern void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *); |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
-extern void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef, void (^block)(CGRect rect)); |
-#endif |
- |
-extern BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef); |
-typedef enum { |
- wkPatternTilingNoDistortion, |
- wkPatternTilingConstantSpacingMinimalDistortion, |
- wkPatternTilingConstantSpacing |
-} wkPatternTiling; |
-extern void (*wkCGContextResetClip)(CGContextRef); |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 |
-extern bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef); |
-#endif |
-extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int); |
-extern CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRef, void *), |
- void (*formFinalize)(CFReadStreamRef, void *), |
- Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *), |
- CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *), |
- Boolean (*formCanRead)(CFReadStreamRef, void *), |
- void (*formClose)(CFReadStreamRef, void *), |
- void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), |
- void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), |
- void *context); |
-extern CFStringRef (*wkCopyCFLocalizationPreferredName)(CFStringRef); |
-extern NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*); |
-extern CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*); |
extern void (*wkDrawBezeledTextFieldCell)(NSRect, BOOL enabled); |
-extern void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect); |
extern void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect); |
extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled); |
-extern void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int radius); |
extern NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange); |
extern NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar); |
extern BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance); |
-extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription); |
-extern NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*); |
-extern NSArray* (*wkGetExtensionsForMIMEType)(NSString*); |
-extern NSString* (*wkGetMIMETypeForExtension)(NSString*); |
-extern ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*); |
-extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response); |
-extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response); |
-extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response); |
-extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous); |
-extern UInt8 (*wkGetNSEventKeyChar)(NSEvent *); |
- |
-extern void (*wkWindowSetAlpha)(NSWindow *, float); |
-extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect); |
-extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); |
-extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void); |
-extern int (*wkQTMovieDataRate)(QTMovie*); |
-extern void (*wkQTMovieDisableComponent)(uint32_t[5]); |
-extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*); |
-extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void); |
-extern float (*wkQTMovieMaxTimeSeekable)(QTMovie*); |
-extern int (*wkQTMovieGetType)(QTMovie*); |
-extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*); |
-extern NSURL *(*wkQTMovieResolvedURL)(QTMovie*); |
-extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL); |
-extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*); |
-extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); |
-extern NSArray *(*wkQTGetSitesInMediaDownloadCache)(); |
-extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site); |
-extern void (*wkQTClearMediaDownloadCache)(); |
-extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); |
-extern void (*wkSetDragImage)(NSImage*, NSPoint offset); |
-extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL); |
-extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL); |
-extern void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform); |
-extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint); |
-extern CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef); |
extern void (*wkSetUpFontCache)(); |
-extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream); |
-extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error); |
-extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream); |
-extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount); |
-extern int (*wkGetHTTPPipeliningPriority)(CFURLRequestRef); |
-extern void (*wkSetHTTPPipeliningMaximumPriority)(int maximumPriority); |
-extern void (*wkSetHTTPPipeliningPriority)(CFURLRequestRef, int priority); |
-extern void (*wkSetHTTPPipeliningMinimumFastLanePriority)(int priority); |
-extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort); |
-extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString); |
-extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL); |
- |
extern void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t); |
extern bool (*wkGetVerticalGlyphsForCharacters)(CTFontRef, const UniChar[], CGGlyph[], size_t); |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
-extern void* wkGetHyphenationLocationBeforeIndex; |
-#else |
-extern CFIndex (*wkGetHyphenationLocationBeforeIndex)(CFStringRef string, CFIndex index); |
- |
-typedef enum { |
- wkEventPhaseNone = 0, |
- wkEventPhaseBegan = 1, |
- wkEventPhaseChanged = 2, |
- wkEventPhaseEnded = 3, |
-} wkEventPhase; |
- |
-extern int (*wkGetNSEventMomentumPhase)(NSEvent *); |
-#endif |
- |
extern CTLineRef (*wkCreateCTLineWithUniCharProvider)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*); |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 |
-enum { |
- wkCTFontTransformApplyShaping = (1 << 0), |
- wkCTFontTransformApplyPositioning = (1 << 1) |
-}; |
- |
-typedef int wkCTFontTransformOptions; |
- |
-extern bool (*wkCTFontTransformGlyphs)(CTFontRef font, CGGlyph glyphs[], CGSize advances[], CFIndex count, wkCTFontTransformOptions options); |
-#endif |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
- |
-extern CTTypesetterRef (*wkCreateCTTypesetterWithUniCharProviderAndOptions)(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); |
- |
-extern int (*wkRecommendedScrollerStyle)(void); |
- |
-extern bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void); |
- |
-extern CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void); |
-extern void (*wkSetCrashReportApplicationSpecificInformation)(CFStringRef); |
- |
-extern NSURL *(*wkAVAssetResolvedURL)(AVAsset*); |
- |
-extern NSCursor *(*wkCursor)(const char*); |
- |
-#endif |
- |
-extern void (*wkUnregisterUniqueIdForElement)(id element); |
-extern void (*wkAccessibilityHandleFocusChanged)(void); |
-extern CFTypeID (*wkGetAXTextMarkerTypeID)(void); |
-extern CFTypeID (*wkGetAXTextMarkerRangeTypeID)(void); |
-extern CFTypeRef (*wkCreateAXTextMarkerRange)(CFTypeRef start, CFTypeRef end); |
-extern CFTypeRef (*wkCopyAXTextMarkerRangeStart)(CFTypeRef range); |
-extern CFTypeRef (*wkCopyAXTextMarkerRangeEnd)(CFTypeRef range); |
-extern CFTypeRef (*wkCreateAXTextMarker)(const void *bytes, size_t len); |
-extern BOOL (*wkGetBytesFromAXTextMarker)(CFTypeRef textMarker, void *bytes, size_t length); |
-extern AXUIElementRef (*wkCreateAXUIElementRef)(id element); |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060 |
-typedef struct __CFURLStorageSession* CFURLStorageSessionRef; |
-#else |
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef; |
-#endif |
-extern CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef); |
-extern NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*); |
- |
-typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef; |
-extern CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef); |
-extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef); |
-extern void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned); |
-extern NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef); |
-extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *); |
-extern void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *); |
-extern void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *); |
-extern void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef); |
- |
-extern CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef); |
-extern CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef); |
-extern CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef); |
-extern CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef); |
-extern void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType); |
- |
-extern void(*wkDestroyRenderingResources)(void); |
- |
-extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path); |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
-#import <dispatch/dispatch.h> |
- |
-extern dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void); |
- |
-#endif |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 |
-extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void); |
-#endif |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
-extern void (*wkCGPathAddRoundedRect)(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight); |
-#endif |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 |
-extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef); |
-#endif |
- |
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 |
-extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime); |
-extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta); |
-extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta); |
-#endif |
- |
-} |
+} // extern "C" |
#endif |