[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 796ce05a84b7231c928dfa1bf90a7198c04b813d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 9 21:20:53 2002 +0000

            Make both calls to adjust CG font cache dynamic.
            The new CGFontCacheSetMaxSize() adds a font cache
            parameter.  Ugh!  This is needed so we can compile
            w/o warnings on stock Jag.
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a0ebb96..fd1d8da 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-09  Richard Williamson  <rjw at apple.com>
+
+        Make both calls to adjust CG font cache dynamic.
+        The new CGFontCacheSetMaxSize() adds a font cache
+        parameter.  Ugh!  This is needed so we can compile
+        w/o warnings on stock Jag.
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-09-09  Ken Kocienda  <kocienda at apple.com>
 
 	Character set information now accessible via WebResourceResponse object,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a0ebb96..fd1d8da 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-09-09  Richard Williamson  <rjw at apple.com>
+
+        Make both calls to adjust CG font cache dynamic.
+        The new CGFontCacheSetMaxSize() adds a font cache
+        parameter.  Ugh!  This is needed so we can compile
+        w/o warnings on stock Jag.
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-09-09  Ken Kocienda  <kocienda at apple.com>
 
 	Character set information now accessible via WebResourceResponse object,
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 80988ec..86785cf 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -130,21 +130,23 @@
 
         // Turn off auto expiration of glyphs in CG's cache
         // and increase the cache size.
-        NSSymbol symbol = NULL;
+        NSSymbol symbol1 = NULL, symbol2 = NULL;
         if (NSIsSymbolNameDefined ("_CGFontCacheSetShouldAutoExpire")){
-            symbol = NSLookupAndBindSymbol("_CGFontCacheSetShouldAutoExpire");
-            if (symbol != NULL) {
-                void (*functionPtr)(CGFontCache *,bool) = NSAddressOfSymbol(symbol);
+            symbol1 = NSLookupAndBindSymbol("_CGFontCacheSetShouldAutoExpire");
+            symbol2 = NSLookupAndBindSymbol("_CGFontCacheSetMaxSize");
+            if (symbol1 != NULL && symbol2 != NULL) {
+                void (*functionPtr1)(CGFontCache *,bool) = NSAddressOfSymbol(symbol1);
+                void (*functionPtr2)(CGFontCache *,size_t) = NSAddressOfSymbol(symbol2);
         
                 CGFontCache *fontCache;
                 fontCache = CGFontCacheCreate();
-                CGFontCacheSetMaxSize (fontCache, 1024*1024);
-                functionPtr (fontCache, false);
+                functionPtr1 (fontCache, false);
+                functionPtr2 (fontCache, 1024*1024);
                 CGFontCacheRelease(fontCache);
             }
         }
 
-        if (symbol == NULL)
+        if (symbol1 == NULL || symbol2 == NULL)
             NSLog(@"CoreGraphics is missing call to disable glyph auto expiration. Pages will load more slowly.");
     }
     ASSERT([[self sharedFactory] isKindOfClass:self]);

-- 
WebKit Debian packaging