[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[podivilov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0c608c822041bf4653ec150b1483c3bfdeddf37e
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 17:21:37 2010 +0000

    2010-10-18  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: disable private browsing for inspector
            https://bugs.webkit.org/show_bug.cgi?id=47827
    
            * WebCoreSupport/WebInspectorClient.mm:
            (-[WebInspectorWindowController init]):
    2010-10-18  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: disable private browsing for inspector
            https://bugs.webkit.org/show_bug.cgi?id=47827
    
            * WebCoreSupport/WebInspectorClient.cpp:
            (WebInspectorClient::openInspectorFrontend):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index e9b2e7a..553e56b 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-18  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: disable private browsing for inspector
+        https://bugs.webkit.org/show_bug.cgi?id=47827
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController init]):
+
 2010-10-14  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
index d0c6c78..b08c161 100644
--- a/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
@@ -217,11 +217,9 @@ void WebInspectorFrontendClient::updateWindowTitle() const
         return nil;
 
     // Keep preferences separate from the rest of the client, making sure we are using expected preference values.
-    // One reason this is good is that it keeps the inspector out of history via "private browsing".
 
     WebPreferences *preferences = [[WebPreferences alloc] init];
     [preferences setAutosaves:NO];
-    [preferences setPrivateBrowsingEnabled:YES];
     [preferences setLoadsImagesAutomatically:YES];
     [preferences setAuthorAndUserStylesEnabled:YES];
     [preferences setJavaScriptEnabled:YES];
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 2b4e501..2eabe89 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-18  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: disable private browsing for inspector
+        https://bugs.webkit.org/show_bug.cgi?id=47827
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::openInspectorFrontend):
+
 2010-10-17  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
index b92a816..76ebc8f 100644
--- a/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
@@ -112,7 +112,6 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon
         return;
 
     // Keep preferences separate from the rest of the client, making sure we are using expected preference values.
-    // One reason this is good is that it keeps the inspector out of history via "private browsing".
     // FIXME: It's crazy that we have to do this song and dance to end up with
     // a private WebPreferences object, even within WebKit. We should make this
     // process simpler, and consider whether we can make it simpler for WebKit
@@ -126,8 +125,6 @@ void WebInspectorClient::openInspectorFrontend(InspectorController* inspectorCon
         return;
     if (FAILED(preferences->setAutosaves(FALSE)))
         return;
-    if (FAILED(preferences->setPrivateBrowsingEnabled(TRUE)))
-        return;
     if (FAILED(preferences->setLoadsImagesAutomatically(TRUE)))
         return;
     if (FAILED(preferences->setAuthorAndUserStylesEnabled(TRUE)))

-- 
WebKit Debian packaging