Reviewed by John.

        Rename WebKitShrinksStandaloneImagesToFitKey to WebKitShrinksStandaloneImagesToFit.

        This is safe to do because the preference is off by default and Safari 3, which is the only client that turns it on,
        is using the setter and not messing around with NSUserDefaults.

        * WebView/WebPreferenceKeysPrivate.h:
        * WebView/WebPreferences.m:
        (+[WebPreferences initialize]):
        (-[WebPreferences shrinksStandaloneImagesToFit]):
        (-[WebPreferences setShrinksStandaloneImagesToFit:]):

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

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index e1e060bdde17a15d357816cbf2be48f7036439c4..b5b3c320cd492a08f3245cd5c10d279296183eb5 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by John.
+
+        Rename WebKitShrinksStandaloneImagesToFitKey to WebKitShrinksStandaloneImagesToFit.
+        
+        This is safe to do because the preference is off by default and Safari 3, which is the only client that turns it on,
+        is using the setter and not messing around with NSUserDefaults.
+        
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.m:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences shrinksStandaloneImagesToFit]):
+        (-[WebPreferences setShrinksStandaloneImagesToFit:]):
+
 2007-11-29  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Anders

diff --git a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
index 5180cc6ccd5b626c77f1f43f271a79ab8051f392..ee4ae0c4e4133d2739980f23d8b2a68c16264a26 100644 (file)
--- a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
+++ b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
@@ -45,7 +45,7 @@
 #define WebKitUserStyleSheetLocationPreferenceKey @"WebKitUserStyleSheetLocationPreferenceKey"
 #define WebKitShouldPrintBackgroundsPreferenceKey @"WebKitShouldPrintBackgroundsPreferenceKey"
 #define WebKitTextAreasAreResizablePreferenceKey @"WebKitTextAreasAreResizable"
-#define WebKitShrinksStandaloneImagesToFit @"WebKitShrinksStandaloneImagesToFitKey"
+#define WebKitShrinksStandaloneImagesToFitPreferenceKey @"WebKitShrinksStandaloneImagesToFit"
 #define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
 #define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
 #define WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey @"WebKitJavaScriptCanOpenWindowsAutomatically"

diff --git a/WebKit/mac/WebView/WebPreferences.m b/WebKit/mac/WebView/WebPreferences.m
index 26f336f773f80c12ab45dee9bb873a9aa6cbaef8..08cdae442833c42fe1ff229ae12ce3d36a1fb0a6 100644 (file)
--- a/WebKit/mac/WebView/WebPreferences.m
+++ b/WebKit/mac/WebView/WebPreferences.m
@@ -310,7 +310,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         @"",                            WebKitUserStyleSheetLocationPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitShouldPrintBackgroundsPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitTextAreasAreResizablePreferenceKey,
-        [NSNumber numberWithBool:NO],   WebKitShrinksStandaloneImagesToFit,
+        [NSNumber numberWithBool:NO],   WebKitShrinksStandaloneImagesToFitPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitJavaEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitJavaScriptEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
@@ -787,12 +787,12 @@ static WebCacheModel cacheModelForMainBundle(void)
 
 - (BOOL)shrinksStandaloneImagesToFit
 {
-    return [self _boolValueForKey:WebKitShrinksStandaloneImagesToFit];
+    return [self _boolValueForKey:WebKitShrinksStandaloneImagesToFitPreferenceKey];
 }
 
 - (void)setShrinksStandaloneImagesToFit:(BOOL)flag
 {
-    [self _setBoolValue:flag forKey:WebKitShrinksStandaloneImagesToFit];
+    [self _setBoolValue:flag forKey:WebKitShrinksStandaloneImagesToFitPreferenceKey];
 }
 
 - (BOOL)automaticallyDetectsCacheModel