diff options
Diffstat (limited to 'WebCore/platform/mac/WebCoreSystemInterface.h')
-rw-r--r-- | WebCore/platform/mac/WebCoreSystemInterface.h | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/WebCore/platform/mac/WebCoreSystemInterface.h b/WebCore/platform/mac/WebCoreSystemInterface.h index fbbacd2..6085483 100644 --- a/WebCore/platform/mac/WebCoreSystemInterface.h +++ b/WebCore/platform/mac/WebCoreSystemInterface.h @@ -40,6 +40,7 @@ typedef struct _NSRect NSRect; #endif #ifdef __OBJC__ +@class NSButtonCell; @class NSData; @class NSEvent; @class NSFont; @@ -49,6 +50,7 @@ typedef struct _NSRect NSRect; @class QTMovieView; #else typedef struct NSArray NSArray; +typedef struct NSButtonCell NSButtonCell; typedef struct NSData NSData; typedef struct NSDate NSDate; typedef struct NSEvent NSEvent; @@ -71,12 +73,10 @@ typedef struct QTMovieView QTMovieView; extern "C" { #endif -#define GLYPH_VECTOR_SIZE (50 * 32) - // In alphabetical order. +extern void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *); extern BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef); -extern void (*wkClearGlyphVector)(void* glyphs); extern CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRef, void *), void (*formFinalize)(CFReadStreamRef, void *), Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *), @@ -86,23 +86,15 @@ extern CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadS void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), void *context); -extern OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs); extern id (*wkCreateNSURLConnectionDelegateProxy)(void); 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 BOOL (*wkFontSmoothingModeIsLCD)(int mode); -extern OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup); -extern CGFontRef (*wkGetCGFontFromNSFont)(NSFont*); extern NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange); extern NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar); -extern void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm); extern BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance); -extern ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector); -extern int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector); -extern size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector); extern void (*wkDrawMediaFullscreenButton)(CGContextRef context, CGRect rect, BOOL active); extern void (*wkDrawMediaMuteButton)(CGContextRef context, CGRect rect, BOOL active); extern void (*wkDrawMediaPauseButton)(CGContextRef context, CGRect rect, BOOL active); @@ -120,26 +112,41 @@ 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 OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs); -extern NSString* (*wkPathFromFont)(NSFont*); extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*); extern int (*wkQTMovieDataRate)(QTMovie*); extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*); extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); -extern void (*wkReleaseStyleGroup)(void* group); extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); extern void (*wkSetDragImage)(NSImage*, NSPoint offset); extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL); extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL); extern void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform); extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint); -extern void (*wkSetUpFontCache)(size_t); +extern void (*wkSetUpFontCache)(); extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream); extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error); extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream); + +#ifndef BUILDING_ON_TIGER +extern void (*wkGetGlyphsForCharacters)(CGFontRef, const UniChar[], CGGlyph[], size_t); +#else +#define GLYPH_VECTOR_SIZE (50 * 32) + +extern void (*wkClearGlyphVector)(void* glyphs); +extern OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs); +extern CFStringRef (*wkCopyFullFontName)(CGFontRef font); +extern OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup); +extern CGFontRef (*wkGetCGFontFromNSFont)(NSFont*); +extern void (*wkGetFontMetrics)(CGFontRef, int* ascent, int* descent, int* lineGap, unsigned* unitsPerEm); +extern ATSLayoutRecord* (*wkGetGlyphVectorFirstRecord)(void* glyphVector); +extern void* wkGetGlyphsForCharacters; +extern int (*wkGetGlyphVectorNumGlyphs)(void* glyphVector); +extern size_t (*wkGetGlyphVectorRecordSize)(void* glyphVector); +extern OSStatus (*wkInitializeGlyphVector)(int count, void* glyphs); +extern void (*wkReleaseStyleGroup)(void* group); extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *); -extern Class (*wkNSURLProtocolClassForReqest)(NSURLRequest *); -extern float (*wkSecondsSinceLastInputEvent)(void); +#endif + #ifdef __cplusplus } #endif |