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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5a3d65af372c4e08e2bfe264e2e72c10fdd396b1
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 15:33:30 2010 +0000

    2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: disable AppCache in chromium.
    
            https://bugs.webkit.org/show_bug.cgi?id=41858
    
            * inspector/front-end/Settings.js:
            * inspector/front-end/StoragePanel.js:
            (WebInspector.StoragePanel):
            (WebInspector.StoragePanel.prototype.reset):
            (WebInspector.StoragePanel.prototype.addApplicationCache):2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: disable AppCache in chromium.
    
            https://bugs.webkit.org/show_bug.cgi?id=41858
    
            * src/js/DevTools.js:
            (WebInspector.loaded):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3a9c46..d59038c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: disable AppCache in chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41858
+
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/StoragePanel.js:
+        (WebInspector.StoragePanel):
+        (WebInspector.StoragePanel.prototype.reset):
+        (WebInspector.StoragePanel.prototype.addApplicationCache):
+
 2010-07-16  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 11f456c..39c1e1e 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -42,7 +42,8 @@ var Preferences = {
     showColorNicknames: true,
     debuggerAlwaysEnabled: false,
     profilerAlwaysEnabled: false,
-    auditsPanelEnabled: true
+    auditsPanelEnabled: true,
+    appCacheEnabled: true
 }
 
 WebInspector.populateApplicationSettings = function(settingsString)
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index 2733907..03a099f 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -49,9 +49,11 @@ WebInspector.StoragePanel = function(database)
     this.sidebarTree.appendChild(this.cookieListTreeElement);
     this.cookieListTreeElement.expand();
 
-    this.applicationCacheListTreeElement = new WebInspector.SidebarSectionTreeElement(WebInspector.UIString("APPLICATION CACHE"), {}, true);
-    this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
-    this.applicationCacheListTreeElement.expand();
+    if (Preferences.appCacheEnabled) {
+        this.applicationCacheListTreeElement = new WebInspector.SidebarSectionTreeElement(WebInspector.UIString("APPLICATION CACHE"), {}, true);
+        this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
+        this.applicationCacheListTreeElement.expand();
+    }
 
     this.storageViews = document.createElement("div");
     this.storageViews.id = "storage-views";
@@ -108,7 +110,9 @@ WebInspector.StoragePanel.prototype = {
         this.localStorageListTreeElement.removeChildren();
         this.sessionStorageListTreeElement.removeChildren();
         this.cookieListTreeElement.removeChildren();
-        this.applicationCacheListTreeElement.removeChildren();
+
+        if (Preferences.appCacheEnabled)
+            this.applicationCacheListTreeElement.removeChildren();
 
         this.storageViews.removeChildren();
 
@@ -146,6 +150,8 @@ WebInspector.StoragePanel.prototype = {
 
     addApplicationCache: function(domain)
     {
+        if (!Preferences.appCacheEnabled)
+            return;
         var applicationCacheTreeElement = new WebInspector.ApplicationCacheSidebarTreeElement(domain);
         this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);
     },
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 19589d3..3e4cc0c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: disable AppCache in chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41858
+
+        * src/js/DevTools.js:
+        (WebInspector.loaded):
+
 2010-07-16  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index f453094..35cca2f 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -143,6 +143,7 @@ WebInspector.loaded = function()
     Preferences.debuggerAlwaysEnabled = true;
     Preferences.profilerAlwaysEnabled = true;
     Preferences.canEditScriptSource = true;
+    Preferences.appCacheEnabled = false;
 
     oldLoaded.call(this);
 

-- 
WebKit Debian packaging