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 938a2d44679b1095517102013241ee3c028d798f..2061a519079af0200cdb348466fb0a80528b652c 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-27  David Hyatt  <hyatt@apple.com>
+
+        Update WebKitSYstemInterface for @font-face changes.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterface.a:
+
 2007-09-18  Geoffrey Garen  <ggaren@apple.com>
 
         Build fix. Ran update-webkitsysteminterface script on Tiger, because

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 3352f0825f1d6ce786bb94b8c2f9eec47d426df8..0a4c2974032f55e09e4a4b10c57862f27ebbeaf1 100644 (file)
--- 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 b79e3c8ad04ed5b4760a70ba6b6aa2f5e422d270..85229f8e1b2b60d003d224c18894700dc2de790a 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterface.a and b/WebKitLibraries/libWebKitSystemInterface.a differ