[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 3ed99b75244e629b0dee01f140f24bad0d2c4557
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 29 22:16:19 2004 +0000

    WebKit:
    
            - some support for "Stealth Browsing"; add a preference that
            controls whether a history item is added when a page is visited.
            This is called "historyIsFrozen" for now, but I wouldn't be
            surprised to see this name change.
    
            Reviewed by Dave.
    
            * WebView.subproj/WebPreferencesPrivate.h:
            new historyIsFrozen, setHistoryIsFrozen: methods
    
            * WebView.subproj/WebPreferences.m:
            new WebKitHistoryIsFrozenPreferenceKey
            (+[WebPreferences initialize]):
            set initial value of WebKitHistoryIsFrozenPreferenceKey
            (-[WebPreferences setHistoryIsFrozen:]):
            set value of WebKitHistoryIsFrozenPreferenceKey
            (-[WebPreferences historyIsFrozen]):
            read value of WebKitHistoryIsFrozenPreferenceKey
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _transitionToCommitted:]):
            don't add item to history if history is frozen
    
    WebBrowser:
    
            A little progress on "Stealth Mode"
    
            Reviewed by Dave.
    
            * AppController.m:
            (-[AppController toggleStealthMode:]):
            replace use of StealthModePreferenceKey with new WebPreferences SPI call
            (-[AppController validateUserInterfaceItem:]):
            ditto
    
            * PreferenceKeys.h:
            remove StealthModePreferenceKey
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 55a3c00..6846a26 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,28 @@
+2004-03-29  John Sullivan  <sullivan at apple.com>
+
+        - some support for "Stealth Browsing"; add a preference that
+        controls whether a history item is added when a page is visited.
+        This is called "historyIsFrozen" for now, but I wouldn't be
+        surprised to see this name change.
+
+        Reviewed by Dave.
+
+        * WebView.subproj/WebPreferencesPrivate.h:
+        new historyIsFrozen, setHistoryIsFrozen: methods
+        
+        * WebView.subproj/WebPreferences.m:
+        new WebKitHistoryIsFrozenPreferenceKey
+        (+[WebPreferences initialize]):
+        set initial value of WebKitHistoryIsFrozenPreferenceKey
+        (-[WebPreferences setHistoryIsFrozen:]):
+        set value of WebKitHistoryIsFrozenPreferenceKey
+        (-[WebPreferences historyIsFrozen]):
+        read value of WebKitHistoryIsFrozenPreferenceKey
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _transitionToCommitted:]):
+        don't add item to history if history is frozen
+
 2004-03-29  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 0e3ec7a..240ae90 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -791,9 +791,11 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
                     // Add item to history and BF list
                     NSURL *URL = [ds _URLForHistory];
                     if (URL && ![URL _web_isEmpty]){
-                        entry = [[WebHistory optionalSharedHistory] addItemForURL:URL];
-                        if (ptitle)
-                            [entry setTitle: ptitle];
+                        if (![[WebPreferences standardPreferences] historyIsFrozen]) {
+                            entry = [[WebHistory optionalSharedHistory] addItemForURL:URL];
+                            if (ptitle)
+                                [entry setTitle: ptitle];                            
+                        }
                         [self _addBackForwardItemClippedAtTarget:YES];
                     }
 
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 5d7d50a..249903a 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -46,6 +46,7 @@
 #define WebKitObjectCacheSizePreferenceKey @"WebKitObjectCacheSizePreferenceKey"
 #define WebKitBackForwardCacheExpirationIntervalKey @"WebKitBackForwardCacheExpirationIntervalKey"
 #define WebKitTabToLinksPreferenceKey @"WebKitTabToLinksPreferenceKey"
+#define WebKitHistoryIsFrozenPreferenceKey @"WebKitHistoryIsFrozen"
 
 NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotification";
 
@@ -234,6 +235,7 @@ NS_ENDHANDLER
         [NSNumber numberWithBool:YES],  WebKitDisplayImagesKey,
         @"1800",                        WebKitBackForwardCacheExpirationIntervalKey,
         [NSNumber numberWithBool:NO],   WebKitTabToLinksPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitHistoryIsFrozenPreferenceKey,
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
@@ -608,6 +610,16 @@ NS_ENDHANDLER
     return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTabToLinksPreferenceKey];
 }
 
+- (void)setHistoryIsFrozen:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitHistoryIsFrozenPreferenceKey];
+}
+
+- (BOOL)historyIsFrozen
+{
+    return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitHistoryIsFrozenPreferenceKey];
+}
+
 static NSMutableDictionary *webPreferencesInstances = nil;
 
 + (WebPreferences *)_getInstanceForIdentifier:(NSString *)ident
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index 48f1cad..3876c1e 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -22,6 +22,9 @@
 
 + (void)_setIBCreatorID:(NSString *)string;
 
+- (void)setHistoryIsFrozen:(BOOL)newValue;
+- (BOOL)historyIsFrozen;
+
 - (void)setTabsToLinks:(BOOL)flag;
 - (BOOL)tabsToLinks;
 

-- 
WebKit Debian packaging