[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 386083cad5d6acc380e760be5c6abcbba0e76c44
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 28 20:05:38 2004 +0000

    WebKit:
    
            - fixed these bugs:
            <rdar://problem/3636570>: "API: [WebPreferences tabsToLinks] should be public API"
            <rdar://problem/3610597>: "API: could turn "stealth browsing" preference into API"
    
            Reviewed by Darin.
    
            I just moved the declarations and implementations from one place to another.
            (No clients in WebKit needed their #imports updated.) This confused cvs diff quite a bit.
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences setTabsToLinks:]):
            (-[WebPreferences tabsToLinks]):
            (-[WebPreferences setPrivateBrowsingEnabled:]):
            (-[WebPreferences privateBrowsingEnabled]):
            (-[WebPreferences _pageCacheSize]):
            (-[WebPreferences _objectCacheSize]):
            (-[WebPreferences _backForwardCacheExpirationInterval]):
            * WebView.subproj/WebPreferencesPrivate.h:
    
    WebBrowser:
    
            - fixed up #imports for WebPreferencesPrivate
    
            Reviewed by Darin.
    
            * AppController.m:
            removed #import <WebKit/WebPreferencesPrivate.h>
            * BrowserWindowController.m:
            replaced #import <WebKit/WebPreferencesPrivate.h> with #import <WebKit/WebPreferences.h>
            * DownloadProgressEntry.m:
            ditto
            * FormCompletionController.m:
            ditto
            * Preferences.subproj/AdvancedPreferences.m:
            removed #import <WebKit/WebPreferencesPrivate.h>
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 55170cb..aa7dceb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2004-04-28  John Sullivan  <sullivan at apple.com>
+
+        - fixed these bugs:
+        <rdar://problem/3636570>: "API: [WebPreferences tabsToLinks] should be public API"        
+        <rdar://problem/3610597>: "API: could turn "stealth browsing" preference into API"
+
+        Reviewed by Darin.
+        
+        I just moved the declarations and implementations from one place to another.
+        (No clients in WebKit needed their #imports updated.) This confused cvs diff quite a bit.
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences setTabsToLinks:]):
+        (-[WebPreferences tabsToLinks]):
+        (-[WebPreferences setPrivateBrowsingEnabled:]):
+        (-[WebPreferences privateBrowsingEnabled]):
+        (-[WebPreferences _pageCacheSize]):
+        (-[WebPreferences _objectCacheSize]):
+        (-[WebPreferences _backForwardCacheExpirationInterval]):
+        * WebView.subproj/WebPreferencesPrivate.h:
+
 2004-04-27  David Hyatt  <hyatt at apple.com>
 
 	Cut the time spent on an operation inside widthForNextCharacter from 17% of the function time down to less than 
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 3f5f18e..b31a9ef 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -289,4 +289,31 @@ extern NSString *WebPreferencesChangedNotification;
 */
 - (BOOL)shouldPrintBackgrounds;
 
+/*!
+    @method setPrivateBrowsingEnabled:
+    @param flag 
+    @abstract If private browsing is enabled, WebKit will not store information
+    about sites the user visits.
+ */
+- (void)setPrivateBrowsingEnabled:(BOOL)flag;
+
+/*!
+    @method privateBrowsingEnabled
+ */
+- (BOOL)privateBrowsingEnabled;
+
+/*!
+    @method setTabsToLinks:
+    @param flag 
+    @abstract If tabsToLinks is YES, the tab key will focus links and form controls. 
+    The option key temporarily reverses this preference.
+*/
+- (void)setTabsToLinks:(BOOL)flag;
+
+/*!
+    @method tabsToLinks
+*/
+- (BOOL)tabsToLinks;
+
+
 @end
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 9c64840..a5cf233 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -546,43 +546,43 @@ NS_ENDHANDLER
     return _private->autosaves;
 }
 
- at end
-
- at implementation WebPreferences (WebPrivate)
-
-- (int)_pageCacheSize
+- (void)setTabsToLinks:(BOOL)flag
 {
-    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitPageCacheSizePreferenceKey];
+    [self _setBoolValue: flag forKey: WebKitTabToLinksPreferenceKey];
 }
 
-- (int)_objectCacheSize
+- (BOOL)tabsToLinks
 {
-    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitObjectCacheSizePreferenceKey];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTabToLinksPreferenceKey];
 }
 
-- (NSTimeInterval)_backForwardCacheExpirationInterval
+- (void)setPrivateBrowsingEnabled:(BOOL)flag
 {
-    return (NSTimeInterval)[[NSUserDefaults standardUserDefaults] floatForKey:WebKitBackForwardCacheExpirationIntervalKey];
+    [self _setBoolValue:flag forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
 }
 
-- (void)setTabsToLinks:(BOOL)flag
+- (BOOL)privateBrowsingEnabled
 {
-    [self _setBoolValue: flag forKey: WebKitTabToLinksPreferenceKey];
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitPrivateBrowsingEnabledPreferenceKey];
 }
 
-- (BOOL)tabsToLinks
+ at end
+
+ at implementation WebPreferences (WebPrivate)
+
+- (int)_pageCacheSize
 {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTabToLinksPreferenceKey];
+    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitPageCacheSizePreferenceKey];
 }
 
-- (void)setPrivateBrowsingEnabled:(BOOL)flag
+- (int)_objectCacheSize
 {
-    [self _setBoolValue:flag forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
+    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitObjectCacheSizePreferenceKey];
 }
 
-- (BOOL)privateBrowsingEnabled
+- (NSTimeInterval)_backForwardCacheExpirationInterval
 {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitPrivateBrowsingEnabledPreferenceKey];
+    return (NSTimeInterval)[[NSUserDefaults standardUserDefaults] floatForKey:WebKitBackForwardCacheExpirationIntervalKey];
 }
 
 static NSMutableDictionary *webPreferencesInstances = nil;
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index 27d37b9..ab20c43 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -16,31 +16,4 @@
 - (NSTimeInterval)_backForwardCacheExpirationInterval;
 
 + (void)_setIBCreatorID:(NSString *)string;
-
-/*!
-    @method setPrivateBrowsingEnabled:
-    @param flag 
-    @abstract If private browsing is enabled, WebKit will not store information
-    about sites the user visits.
-*/
-- (void)setPrivateBrowsingEnabled:(BOOL)flag;
-
-/*!
-    @method privateBrowsingEnabled
- */
-- (BOOL)privateBrowsingEnabled;
-
-/*!
-    @method setTabsToLinks:
-    @param flag 
-    @abstract If tabsToLinks is YES, the tab key will focus links and form controls. 
-    The option key temporarily reverses this preference.
-*/
-- (void)setTabsToLinks:(BOOL)flag;
-
-/*!
-    @method tabsToLinks
-*/
-- (BOOL)tabsToLinks;
-
 @end

-- 
WebKit Debian packaging