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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5865be8fb86e39df29fef7b1cb9b00b6c2b49345
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 05:52:51 2010 +0000

    2010-07-28  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Enable UI for chromium's appcache inspection.
            https://bugs.webkit.org/show_bug.cgi?id=43098
    
            * inspector/front-end/Settings.js: Removed appCacheEnabled.
            * inspector/front-end/StoragePanel.js: Removed appCacheEnabled condition.
            (WebInspector.StoragePanel):
            (WebInspector.StoragePanel.prototype.reset):
            (WebInspector.StoragePanel.prototype.addApplicationCache):
    2010-07-28  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Enable UI for chromium's appcache inspection.
            https://bugs.webkit.org/show_bug.cgi?id=43098
    
            * src/js/DevTools.js:
            (WebInspector.loaded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 999b591..3755218 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-28  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Enable UI for chromium's appcache inspection.
+        https://bugs.webkit.org/show_bug.cgi?id=43098
+
+        * inspector/front-end/Settings.js: Removed appCacheEnabled.
+        * inspector/front-end/StoragePanel.js: Removed appCacheEnabled condition.
+        (WebInspector.StoragePanel):
+        (WebInspector.StoragePanel.prototype.reset):
+        (WebInspector.StoragePanel.prototype.addApplicationCache):
+
 2010-07-28  Bryan Gislason  <bgislason at rim.com>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index 22db491..e54acc7 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -43,7 +43,6 @@ var Preferences = {
     debuggerAlwaysEnabled: false,
     profilerAlwaysEnabled: false,
     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 03a099f..68563de 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -49,12 +49,11 @@ WebInspector.StoragePanel = function(database)
     this.sidebarTree.appendChild(this.cookieListTreeElement);
     this.cookieListTreeElement.expand();
 
-    if (Preferences.appCacheEnabled) {
-        this.applicationCacheListTreeElement = new WebInspector.SidebarSectionTreeElement(WebInspector.UIString("APPLICATION CACHE"), {}, true);
-        this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
-        this.applicationCacheListTreeElement.expand();
-    }
-
+    
+    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";
     this.element.appendChild(this.storageViews);
@@ -111,8 +110,7 @@ WebInspector.StoragePanel.prototype = {
         this.sessionStorageListTreeElement.removeChildren();
         this.cookieListTreeElement.removeChildren();
 
-        if (Preferences.appCacheEnabled)
-            this.applicationCacheListTreeElement.removeChildren();
+        this.applicationCacheListTreeElement.removeChildren();
 
         this.storageViews.removeChildren();
 
@@ -150,8 +148,6 @@ 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 2c720e1..37e8793 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-28  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Enable UI for chromium's appcache inspection.
+        https://bugs.webkit.org/show_bug.cgi?id=43098
+
+        * src/js/DevTools.js:
+        (WebInspector.loaded):
+
 2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 640474b..674f1d7 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -165,8 +165,7 @@ WebInspector.loaded = function()
     Preferences.debuggerAlwaysEnabled = true;
     Preferences.profilerAlwaysEnabled = true;
     Preferences.canEditScriptSource = true;
-    Preferences.appCacheEnabled = false;
-
+    
     if ("page" in WebInspector._paramsObject) {
         WebInspector.loadedDone = true;
         if (WebInspector.socketOpened)

-- 
WebKit Debian packaging