Added some font-related functions needed for <rdar://5549919>

         Reviewed by Ada.

         * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
         * win/lib/WebKitSystemInterface.lib:
         * win/lib/WebKitSystemInterface_debug.lib:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27016 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index cf25e9076e03276e83cd6aad2bb3465f63698a21..85e9050b4534f72af268b4892029e260c6a20776 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-24  Adam Roben  <aroben@apple.com>
+
+        Added some font-related functions needed for <rdar://5549919>
+
+        Reviewed by Ada.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2007-10-24  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Mark Rowe.

diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 556b153174e6efbc0e2d3f0f913a51076a165442..dca7b14d215549a41fd3be1b42d4a88cf47e3abe 100644 (file)
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -29,6 +29,8 @@
 struct CGAffineTransform;
 struct CGSize;
 
+typedef const struct __CFData* CFDataRef;
+typedef const struct __CFString* CFStringRef;
 typedef struct CGColor* CGColorRef;
 typedef struct CGContext* CGContextRef;
 typedef unsigned short CGFontIndex;
@@ -45,6 +47,10 @@ void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle);
 void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance);
 void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count);
 void wkSetUpFontCache(size_t s);
+void wkAddFontsInDirectory(CFStringRef);
+void wkAddFontsAtPath(CFStringRef);
+void wkAddFontsFromPlistRepresentation(CFDataRef);
+CFDataRef wkCreateFontsPlistRepresentation();
 
 void wkDrawFocusRing(CGContextRef, CGColorRef, float radius);
 

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index de0dea7bd2fa6a4f2eed960e5dfd910d49e6fef5..46d51be6c7e2b6984d505716111230f98804b925 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ

diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 7678c43cdd2a71ddd8a81760b2f3b0ae55bc7cc4..3f7ee7b0b6e5bc9cb61bb13d81f4633c8285fe18 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ