[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 f541921078a20ead7dba6d77f17dbfb0fb3b7596
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 29 22:02:24 2003 +0000

    	Fixed 3401334.  Use IB document key when checking for reference removal on instances of WebPreferences.
    
    	Also removed _userDefaultsKeysForIB, no longer needed by IB.
    
            Reviewed by John.
    
            * WebView.subproj/WebPreferences.m:
            (+[WebPreferences _removeReferenceForIdentifier:]):
            (-[WebPreferences _postPreferencesChangesNotification]):
            * WebView.subproj/WebPreferencesPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a6925a9..c7485e4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-08-29  Richard Williamson   <rjw at apple.com>
 
+	Fixed 3401334.  Use IB document key when checking for reference removal on instances of WebPreferences.
+
+	Also removed _userDefaultsKeysForIB, no longer needed by IB.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences _removeReferenceForIdentifier:]):
+        (-[WebPreferences _postPreferencesChangesNotification]):
+        * WebView.subproj/WebPreferencesPrivate.h:
+
+2003-08-29  Richard Williamson   <rjw at apple.com>
+
 	Fixed 3400807.  Don't release state associated with the current b/f item.  We shouldn't normally have page cache state associated with the current item (3401376).  This fix guarantees that we won't prematurely release the page cache state for the current item.
 
         Reviewed byJohn Sullivan.
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 336b699..c0bc565 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -585,7 +585,7 @@ static NSMutableDictionary *webPreferencesInstances = nil;
 
 + (void)_removeReferenceForIdentifier:(NSString *)ident
 {
-    [webPreferencesInstances performSelector:@selector(_web_checkLastReferenceForIdentifier:) withObject:ident afterDelay:.1];
+    [webPreferencesInstances performSelector:@selector(_web_checkLastReferenceForIdentifier:) withObject: [self _concatenateKeyWithIBCreatorID:ident] afterDelay:.1];
 }
 
 - (void)_postPreferencesChangesNotification
@@ -595,31 +595,6 @@ static NSMutableDictionary *webPreferencesInstances = nil;
                     userInfo:nil];
 }
 
-// This may NOT be used by IB anymore.  Check we Eric S. to see if we can remove.
-+ (NSArray *)_userDefaultsKeysForIB
-{
-    return [NSArray arrayWithObjects:
-        WebKitStandardFontPreferenceKey,
-        WebKitFixedFontPreferenceKey,
-        WebKitSerifFontPreferenceKey,
-        WebKitSansSerifFontPreferenceKey,
-        WebKitCursiveFontPreferenceKey,
-        WebKitFantasyFontPreferenceKey,
-        WebKitMinimumFontSizePreferenceKey,
-        WebKitDefaultFontSizePreferenceKey,
-        WebKitDefaultFixedFontSizePreferenceKey,
-        WebKitDefaultTextEncodingNamePreferenceKey,
-        WebKitJavaEnabledPreferenceKey,
-        WebKitJavaScriptEnabledPreferenceKey,
-        WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
-        WebKitPluginsEnabledPreferenceKey,
-        WebKitAllowAnimatedImagesPreferenceKey,
-        WebKitAllowAnimatedImageLoopingPreferenceKey,
-        WebKitDisplayImagesKey,
-        nil
-    ];
-}
-
 static NSString *classIBCreatorID = 0;
 
 + (void)_setIBCreatorID:(NSString *)string
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index 4bcb018..c241357 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -18,7 +18,6 @@
 + (WebPreferences *)_getInstanceForIdentifier:(NSString *)identifier;
 + (void)_setInstance:(WebPreferences *)instance forIdentifier:(NSString *)identifier;
 + (void)_removeReferenceForIdentifier:(NSString *)identifier;
-+ (NSArray *)_userDefaultsKeysForIB;
 - (NSTimeInterval)_backForwardCacheExpirationInterval;
 
 + (void)_setIBCreatorID:(NSString *)string;

-- 
WebKit Debian packaging