[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 d7180795f151f3efb359e1e38d4838dade565dc8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 15 17:33:10 2003 +0000

    	Fixed 3379439.  Remove checks for CG symbols.  No longer needed.
    
            Reviewed by Darin.
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
            (+[WebTextRendererFactory createSharedFactory]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1845a33..edee28e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-15  Richard Williamson  <rjw at apple.com>
+
+	Fixed 3379439.  Remove checks for CG symbols.  No longer needed.
+
+        Reviewed by Darin.
+
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+        (+[WebTextRendererFactory createSharedFactory]):
+
 === Safari-93 ===
 
 2003-08-14  Vicki Murley  <vicki at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index f366ef0..0ba16d4 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -180,35 +180,20 @@ static int getLCDScaleParameters(void)
     if (![self sharedFactory]) {
         [[[self alloc] init] release];
 
-        // Turn off auto expiration of glyphs in CG's cache
-        // and increase the cache size.
-        NSSymbol symbol1 = NULL, symbol2 = NULL;
-        if (NSIsSymbolNameDefined ("_CGFontCacheSetShouldAutoExpire")){
-            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();
-                functionPtr1 (fontCache, false);
-
-                size_t s;
-                if (WebSystemMainMemory() > 128 * 1024 * 1024)
-                    s = MINIMUM_GLYPH_CACHE_SIZE*getLCDScaleParameters();
-                else
-                    s = MINIMUM_GLYPH_CACHE_SIZE;
+        CGFontCache *fontCache;
+        fontCache = CGFontCacheCreate();
+        CGFontCacheSetShouldAutoExpire (fontCache, false);
+
+        size_t s;
+        if (WebSystemMainMemory() > 128 * 1024 * 1024)
+            s = MINIMUM_GLYPH_CACHE_SIZE*getLCDScaleParameters();
+        else
+            s = MINIMUM_GLYPH_CACHE_SIZE;
 #ifndef NDEBUG
-                LOG (CacheSizes, "Glyph cache size set to %d bytes.", s);
+        LOG (CacheSizes, "Glyph cache size set to %d bytes.", s);
 #endif
-                functionPtr2 (fontCache, s);
-                CGFontCacheRelease(fontCache);
-            }
-        }
-
-        if (symbol1 == NULL || symbol2 == NULL)
-            NSLog(@"CoreGraphics is missing call to disable glyph auto expiration. Pages will load more slowly.");
+        CGFontCacheSetMaxSize (fontCache, s);
+        CGFontCacheRelease(fontCache);
     }
     ASSERT([[self sharedFactory] isKindOfClass:self]);
 }

-- 
WebKit Debian packaging