Remove code for calculating the glyph cache size.
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Apr 2008 01:29:28 +0000 (01:29 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Apr 2008 01:29:28 +0000 (01:29 +0000)
Reviewed by Sam Weinig.

WebCore:
* WebCore.base.exp: Remove unused symbol.
* platform/graphics/mac/FontCacheMac.mm: Remove code that is unused now that we do not compute the glyph cache size.
* platform/mac/WebCoreSystemInterface.h: Remove unused symbol.
* platform/mac/WebCoreSystemInterface.mm: Ditto.

WebKit:
* WebCoreSupport/WebSystemInterface.m:
(InitWebCoreSystemInterface): Remove unused symbol.

WebKitSystemInterface:
* WebKitSystemInterface.h: Remove unused symbol.
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceTiger.a:

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

WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/platform/graphics/mac/FontCacheMac.mm
WebCore/platform/mac/WebCoreSystemInterface.h
WebCore/platform/mac/WebCoreSystemInterface.mm
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebSystemInterface.m
WebKitLibraries/ChangeLog
WebKitLibraries/WebKitSystemInterface.h
WebKitLibraries/libWebKitSystemInterfaceLeopard.a
WebKitLibraries/libWebKitSystemInterfaceTiger.a

index 1de23f3..55de907 100644 (file)
@@ -2,6 +2,17 @@
 
         Reviewed by Sam Weinig.
 
+        Remove code for calculating the glyph cache size.
+
+        * WebCore.base.exp: Remove unused symbol.
+        * platform/graphics/mac/FontCacheMac.mm: Remove code that is unused now that we do not compute the glyph cache size.
+        * platform/mac/WebCoreSystemInterface.h: Remove unused symbol.
+        * platform/mac/WebCoreSystemInterface.mm: Ditto.
+
+2008-04-24  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Sam Weinig.
+
         Add a definition of BUILDING_ON_LEOPARD to complement BUILDING_ON_TIGER.
 
         * WebCorePrefix.h:
index 3ad13c5..c05cdd9 100644 (file)
@@ -841,7 +841,6 @@ _wkDrawMediaSliderThumb
 _wkDrawMediaSliderTrack
 _wkDrawMediaUnMuteButton
 _wkDrawTextFieldCellFocusRing
-_wkFontSmoothingModeIsLCD
 _wkGetATSStyleGroup
 _wkGetExtensionsForMIMEType
 _wkGetFontInLanguageForCharacter
index 9ee4dfa..23e22c9 100644 (file)
@@ -42,84 +42,9 @@ typedef int NSInteger;
 
 namespace WebCore {
 
-static bool getAppDefaultValue(CFStringRef key, int *v)
-{
-    CFPropertyListRef value;
-
-    value = CFPreferencesCopyValue(key, kCFPreferencesCurrentApplication,
-                                   kCFPreferencesAnyUser,
-                                   kCFPreferencesAnyHost);
-    if (value == 0) {
-        value = CFPreferencesCopyValue(key, kCFPreferencesCurrentApplication,
-                                       kCFPreferencesCurrentUser,
-                                       kCFPreferencesAnyHost);
-        if (value == 0)
-            return false;
-    }
-
-    if (CFGetTypeID(value) == CFNumberGetTypeID()) {
-        if (v != 0)
-            CFNumberGetValue((const CFNumberRef)value, kCFNumberIntType, v);
-    } else if (CFGetTypeID(value) == CFStringGetTypeID()) {
-        if (v != 0)
-            *v = CFStringGetIntValue((const CFStringRef)value);
-    } else {
-        CFRelease(value);
-        return false;
-    }
-
-    CFRelease(value);
-    return true;
-}
-
-static bool getUserDefaultValue(CFStringRef key, int *v)
-{
-    CFPropertyListRef value;
-
-    value = CFPreferencesCopyValue(key, kCFPreferencesAnyApplication,
-                                   kCFPreferencesCurrentUser,
-                                   kCFPreferencesCurrentHost);
-    if (value == 0)
-        return false;
-
-    if (CFGetTypeID(value) == CFNumberGetTypeID()) {
-        if (v != 0)
-            CFNumberGetValue((const CFNumberRef)value, kCFNumberIntType, v);
-    } else if (CFGetTypeID(value) == CFStringGetTypeID()) {
-        if (v != 0)
-            *v = CFStringGetIntValue((const CFStringRef)value);
-    } else {
-        CFRelease(value);
-        return false;
-    }
-
-    CFRelease(value);
-    return true;
-}
-
-static int getLCDScaleParameters(void)
-{
-    int mode;
-    CFStringRef key;
-
-    key = CFSTR("AppleFontSmoothing");
-    if (!getAppDefaultValue(key, &mode)) {
-        if (!getUserDefaultValue(key, &mode))
-            return 1;
-    }
-
-    if (wkFontSmoothingModeIsLCD(mode))
-        return 4;
-    return 1;
-}
-
-#define MINIMUM_GLYPH_CACHE_SIZE 1536 * 1024
-
 void FontCache::platformInit()
 {
-    size_t s = MINIMUM_GLYPH_CACHE_SIZE*getLCDScaleParameters();
-
-    wkSetUpFontCache(s);
+    wkSetUpFontCache();
 }
 
 static int toAppKitFontWeight(FontWeight fontWeight)
index a645d65..e56a12d 100644 (file)
@@ -93,7 +93,6 @@ extern void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect);
 extern void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
 extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
 extern void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int radius);
-extern BOOL (*wkFontSmoothingModeIsLCD)(int mode);
 extern OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
 extern CGFontRef (*wkGetCGFontFromNSFont)(NSFont*);
 extern NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
@@ -131,7 +130,7 @@ extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
 extern void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform);
 extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint);
-extern void (*wkSetUpFontCache)(size_t);
+extern void (*wkSetUpFontCache)();
 extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
 extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
index 3ee1fba..a54c420 100644 (file)
@@ -36,7 +36,6 @@ void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect);
 void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
 void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
 void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int radius);
-BOOL (*wkFontSmoothingModeIsLCD)(int mode);
 OSStatus (*wkGetATSStyleGroup)(ATSUStyle, void** styleGroup);
 NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
 NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar);
@@ -70,7 +69,7 @@ void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
 void (*wkSetDragImage)(NSImage*, NSPoint offset);
 void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform);
 void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
-void (*wkSetUpFontCache)(size_t);
+void (*wkSetUpFontCache)();
 void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
 void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
index 5619c17..5852d98 100644 (file)
@@ -2,6 +2,15 @@
 
         Reviewed by Sam Weinig.
 
+        Remove code for calculating the glyph cache size.
+
+        * WebCoreSupport/WebSystemInterface.m:
+        (InitWebCoreSystemInterface): Remove unused symbol.
+
+2008-04-24  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Sam Weinig.
+
         Add a definition of BUILDING_ON_LEOPARD to complement BUILDING_ON_TIGER.
 
         * WebKitPrefix.h:
index a6a98fc..13b771b 100644 (file)
@@ -58,7 +58,6 @@ void InitWebCoreSystemInterface(void)
     INIT(DrawMediaSliderThumb);
     INIT(DrawMediaUnMuteButton);
     INIT(DrawTextFieldCellFocusRing);
-    INIT(FontSmoothingModeIsLCD);
     INIT(GetATSStyleGroup);
     INIT(GetExtensionsForMIMEType);
     INIT(GetFontInLanguageForCharacter);
index fa77a29..ef7253b 100644 (file)
@@ -1,3 +1,13 @@
+2008-04-24  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Remove code for calculating the glyph cache size.
+
+        * WebKitSystemInterface.h: Remove unused symbol.
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
 2008-03-28  Steve Falkenburg  <sfalken@apple.com>
 
         Versioning.
index 9afe6e5..c47a07b 100644 (file)
@@ -71,8 +71,7 @@ void WKAccessibilityHandleFocusChanged(void);
 AXUIElementRef WKCreateAXUIElementRef(id element);
 void WKUnregisterUniqueIdForElement(id element);
 
-BOOL WKFontSmoothingModeIsLCD(int mode);
-void WKSetUpFontCache(size_t s);
+void WKSetUpFontCache(void);
 
 void WKSignalCFReadStreamEnd(CFReadStreamRef stream);
 void WKSignalCFReadStreamHasBytes(CFReadStreamRef stream);
index 951291c..9d60779 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ
index be8197c..739b016 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ