[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 9d9b16a5675d2f24effd7584ae3d1ec16e6d2a15
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 5 19:34:40 2002 +0000

            Only disable timed expiration of CG glyph cache if SPI is available.
            (per Bertrand's request)
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 12aa95a..915b8c9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+        
+        Only disable timed expiration of CG glyph cache if SPI is available.
+        (per Bertrand's request)
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-09-05  John Sullivan  <sullivan at apple.com>
 
         * Resources/url_icon.tiff: New generic icon from Steve Lemay.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 12aa95a..915b8c9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+        
+        Only disable timed expiration of CG glyph cache if SPI is available.
+        (per Bertrand's request)
+        
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+
 2002-09-05  John Sullivan  <sullivan at apple.com>
 
         * Resources/url_icon.tiff: New generic icon from Steve Lemay.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 2994476..b841f97 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -2,6 +2,8 @@
     WebTextRendererFactory.m
     Copyright 2002, Apple, Inc. All rights reserved.
 */
+#import <mach-o/dyld.h>                // for NSSymbol, NSAddressOfSymbolWithHint(), NSLookupAndBindSymbolWithHint()
+
 #import <WebKit/WebTextRendererFactory.h>
 #import <WebKit/WebTextRenderer.h>
 #import <WebKit/WebKitDebug.h>
@@ -126,11 +128,20 @@
 
         // Turn off auto expiration of glyphs in CG's cache
         // and increase the cache size.
-        CGFontCache *fontCache;
-        fontCache = CGFontCacheCreate();
-        CGFontCacheSetMaxSize (fontCache, 1024*1024);
-        CGFontCacheSetShouldAutoExpire (fontCache, false);
-        CGFontCacheRelease(fontCache);
+        NSSymbol symbol;
+        void (*functionPtr)(CGFontCache *,bool) = NULL;
+        
+        symbol = NSLookupAndBindSymbol("_CGFontCacheSetShouldAutoExpire");
+        if (symbol != NULL) {
+            NSLog (@"Disabling glyph auto expiration in CG\n");
+            functionPtr = NSAddressOfSymbol(symbol);
+    
+            CGFontCache *fontCache;
+            fontCache = CGFontCacheCreate();
+            CGFontCacheSetMaxSize (fontCache, 1024*1024);
+            functionPtr (fontCache, false);
+            CGFontCacheRelease(fontCache);
+        }
     }
     WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
 }

-- 
WebKit Debian packaging