From: hyatt Date: Thu, 27 Sep 2007 16:18:39 +0000 (+0000) Subject: Update WebKitSYstemInterface for @font-face changes. X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=059c7c110b40fe52c60ddad6151c3ae73a94de00 Update WebKitSYstemInterface for @font-face changes. * WebKitSystemInterface.h: * libWebKitSystemInterface.a: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25775 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 938a2d44679b..2061a519079a 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 David Hyatt + + Update WebKitSYstemInterface for @font-face changes. + + * WebKitSystemInterface.h: + * libWebKitSystemInterface.a: + 2007-09-18 Geoffrey Garen Build fix. Ran update-webkitsysteminterface script on Tiger, because diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 3352f0825f1d..0a4c2974032f 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -111,10 +111,10 @@ BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent void WKSendKeyEventToTSM(NSEvent *theEvent); void WKCallDrawingNotification(CGrafPtr port, Rect *bounds); #endif - -BOOL WKGetGlyphTransformedAdvances(NSFont *font, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance); + +BOOL WKGetGlyphTransformedAdvances(CGFontRef, NSFont*, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance); CGFontRef WKGetCGFontFromNSFont(NSFont *font); -void WKGetFontMetrics(NSFont *font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); +void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm); NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range); NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch); void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font); @@ -124,8 +124,6 @@ BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext); void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint); -#define WKGlyphVectorSize (50 * 32) - typedef void *WKGlyphVectorRef; OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); diff --git a/WebKitLibraries/libWebKitSystemInterface.a b/WebKitLibraries/libWebKitSystemInterface.a index b79e3c8ad04e..85229f8e1b2b 100644 Binary files a/WebKitLibraries/libWebKitSystemInterface.a and b/WebKitLibraries/libWebKitSystemInterface.a differ