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

[caseq at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 87f43376cce9fe0a66bfbb5e71feaa71061143bd
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 13:29:50 2010 +0000

    2010-12-01  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: disable cookies tab in network resource view by default, enable for chromium
            https://bugs.webkit.org/show_bug.cgi?id=50249
    
            * inspector/front-end/NetworkItemView.js:
            (WebInspector.NetworkItemView):
            (WebInspector.NetworkItemView.prototype.resize):
            * inspector/front-end/Settings.js:
    2010-12-01  Andrey Kosyakov  <caseq at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: disable cookies tab in network resource view by default, enable for chromium
            https://bugs.webkit.org/show_bug.cgi?id=50249
    
            * src/js/DevTools.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 02e8411..6c004c4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-01  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: disable cookies tab in network resource view by default, enable for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=50249
+
+        * inspector/front-end/NetworkItemView.js:
+        (WebInspector.NetworkItemView):
+        (WebInspector.NetworkItemView.prototype.resize):
+        * inspector/front-end/Settings.js:
+
 2010-12-01  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/inspector/front-end/NetworkItemView.js b/WebCore/inspector/front-end/NetworkItemView.js
index 927e840..48e3b19 100644
--- a/WebCore/inspector/front-end/NetworkItemView.js
+++ b/WebCore/inspector/front-end/NetworkItemView.js
@@ -37,7 +37,6 @@ WebInspector.NetworkItemView = function(resource)
     this._headersView = new WebInspector.ResourceHeadersView(resource);
     // Do not store reference to content view - it can be recreated.
     var contentView = WebInspector.ResourceManager.resourceViewForResource(resource);
-    this._cookiesView = new WebInspector.ResourceCookiesView(resource);
 
     this._tabbedPane = new WebInspector.TabbedPane(this.element);
     this._tabbedPane.appendTab("headers", WebInspector.UIString("Headers"), this._headersView);
@@ -46,8 +45,10 @@ WebInspector.NetworkItemView = function(resource)
         contentView.visible = false;
         this._tabbedPane.appendTab("content", WebInspector.UIString("Content"), contentView);
     }
-    this._tabbedPane.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
-
+    if (Preferences.showCookiesTab) {
+        this._cookiesView = new WebInspector.ResourceCookiesView(resource);
+        this._tabbedPane.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
+    }
     if (Preferences.showTimingTab) {
         var timingView = new WebInspector.ResourceTimingView(resource);
         this._tabbedPane.appendTab("timing", WebInspector.UIString("Timing"), timingView);
@@ -82,7 +83,7 @@ WebInspector.NetworkItemView.prototype = {
 
     resize: function()
     {
-        if (this._cookiesView.visible)
+        if (this._cookiesView && this._cookiesView.visible)
             this._cookiesView.resize();
     }
 }
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 9aac626..163b184 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -48,6 +48,7 @@ var Preferences = {
     fileSystemEnabled: false,
     useDataURLForResourceImageIcons: true,
     showTimingTab: false,
+    showCookiesTab: false,
     debugMode: false
 }
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9fd2814..e12c52c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-01  Andrey Kosyakov  <caseq at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: disable cookies tab in network resource view by default, enable for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=50249
+
+        * src/js/DevTools.js:
+
 2010-11-30  Ojan Vafai  <ojan at chromium.org>
 
         Revert r72876. It caused a ~30% perf regression in chromium's bloat-http test
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 11ebc1f..5bb150c 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -48,6 +48,7 @@ var context = {};  // Used by WebCore's inspector routines.
     Preferences.nativeInstrumentationEnabled = true;
     Preferences.fileSystemEnabled = false;
     Preferences.showTimingTab = true;
+    Preferences.showCookiesTab = true;
 })();
 
 var devtools = devtools || {};

-- 
WebKit Debian packaging