From: aroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 25 Oct 2007 05:20:32 +0000 (+0000)
Subject:          Added some font-related functions needed for <rdar://5549919>
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=faf83befc1aba08832e84a54326dc6a1fb968fcc;hp=3188b13bf8422ed4f5df4b8e5faf56229ba804f8

     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 cf25e9076e03..85e9050b4534 100644
--- 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 556b153174e6..dca7b14d2155 100644
--- 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 de0dea7bd2fa..46d51be6c7e2 100644
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 7678c43cdd2a..3f7ee7b0b6e5 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ