[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 438db175912e478cb5a09ed8f042592fcf7e5559
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 13:29:40 2010 +0000

    2010-08-06  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: Remove "Online/Offline" icon for Chrome's appcache devtools UI.
            https://bugs.webkit.org/show_bug.cgi?id=43450
    
            * inspector/front-end/ApplicationCacheItemsView.js:
            (WebInspector.ApplicationCacheItemsView):
            (WebInspector.ApplicationCacheItemsView.prototype.get statusBarItems):
            (WebInspector.ApplicationCacheItemsView.prototype.updateNetworkState):
            * inspector/front-end/Settings.js:
    2010-08-06  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: Remove "Online/Offline" icon for Chrome's appcache devtools UI.
            https://bugs.webkit.org/show_bug.cgi?id=43450
    
            * src/js/DevTools.js:
            (WebInspector.loaded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1f2265..113e4b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-06  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: Remove "Online/Offline" icon for Chrome's appcache devtools UI.
+        https://bugs.webkit.org/show_bug.cgi?id=43450
+
+        * inspector/front-end/ApplicationCacheItemsView.js:
+        (WebInspector.ApplicationCacheItemsView):
+        (WebInspector.ApplicationCacheItemsView.prototype.get statusBarItems):
+        (WebInspector.ApplicationCacheItemsView.prototype.updateNetworkState):
+        * inspector/front-end/Settings.js:
+
 2010-08-06  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Rolling out 64835, 64836 and 64839.
diff --git a/WebCore/inspector/front-end/ApplicationCacheItemsView.js b/WebCore/inspector/front-end/ApplicationCacheItemsView.js
index 029f83b..f450938 100644
--- a/WebCore/inspector/front-end/ApplicationCacheItemsView.js
+++ b/WebCore/inspector/front-end/ApplicationCacheItemsView.js
@@ -41,12 +41,14 @@ WebInspector.ApplicationCacheItemsView = function(treeElement, appcacheDomain)
     this.refreshButton = new WebInspector.StatusBarButton(WebInspector.UIString("Refresh"), "refresh-storage-status-bar-item");
     this.refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
 
-    this.connectivityIcon = document.createElement("img");
-    this.connectivityIcon.className = "storage-application-cache-connectivity-icon";
-    this.connectivityIcon.src = "";
-    this.connectivityMessage = document.createElement("span");
-    this.connectivityMessage.className = "storage-application-cache-connectivity";
-    this.connectivityMessage.textContent = "";
+    if (Preferences.onlineDetectionEnabled) {
+        this.connectivityIcon = document.createElement("img");
+        this.connectivityIcon.className = "storage-application-cache-connectivity-icon";
+        this.connectivityIcon.src = "";
+        this.connectivityMessage = document.createElement("span");
+        this.connectivityMessage.className = "storage-application-cache-connectivity";
+        this.connectivityMessage.textContent = "";
+    }
 
     this.divider = document.createElement("span");
     this.divider.className = "status-bar-item status-bar-divider";
@@ -72,11 +74,18 @@ WebInspector.ApplicationCacheItemsView = function(treeElement, appcacheDomain)
 WebInspector.ApplicationCacheItemsView.prototype = {
     get statusBarItems()
     {
-        return [
-            this.refreshButton.element, this.deleteButton.element,
-            this.connectivityIcon, this.connectivityMessage, this.divider,
-            this.statusIcon, this.statusMessage
-        ];
+        if (Preferences.onlineDetectionEnabled) {
+            return [
+                this.refreshButton.element, this.deleteButton.element,
+                this.connectivityIcon, this.connectivityMessage, this.divider,
+                this.statusIcon, this.statusMessage
+            ];
+        } else {
+            return [
+                this.refreshButton.element, this.deleteButton.element, this.divider,
+                this.statusIcon, this.statusMessage
+            ];
+        }
     },
 
     show: function(parentElement)
@@ -114,12 +123,14 @@ WebInspector.ApplicationCacheItemsView.prototype = {
 
     updateNetworkState: function(isNowOnline)
     {
-        if (isNowOnline) {
-            this.connectivityIcon.src = "Images/successGreenDot.png";
-            this.connectivityMessage.textContent = WebInspector.UIString("Online");
-        } else {
-            this.connectivityIcon.src = "Images/errorRedDot.png";
-            this.connectivityMessage.textContent = WebInspector.UIString("Offline");
+        if (Preferences.onlineDetectionEnabled) {
+            if (isNowOnline) {
+                this.connectivityIcon.src = "Images/successGreenDot.png";
+                this.connectivityMessage.textContent = WebInspector.UIString("Online");
+            } else {
+                this.connectivityIcon.src = "Images/errorRedDot.png";
+                this.connectivityMessage.textContent = WebInspector.UIString("Offline");
+            }
         }
     },
 
diff --git a/WebCore/inspector/front-end/Settings.js b/WebCore/inspector/front-end/Settings.js
index e54acc7..c84ba79 100644
--- a/WebCore/inspector/front-end/Settings.js
+++ b/WebCore/inspector/front-end/Settings.js
@@ -43,6 +43,7 @@ var Preferences = {
     debuggerAlwaysEnabled: false,
     profilerAlwaysEnabled: false,
     auditsPanelEnabled: true,
+    onlineDetectionEnabled: true
 }
 
 WebInspector.populateApplicationSettings = function(settingsString)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f7d9078..99bbeec 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-06  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: Remove "Online/Offline" icon for Chrome's appcache devtools UI.
+        https://bugs.webkit.org/show_bug.cgi?id=43450
+
+        * src/js/DevTools.js:
+        (WebInspector.loaded):
+
 2010-08-05  Marcus Bulach  <bulach at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 2faa69f..895c68b 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -113,6 +113,7 @@ WebInspector.loaded = function()
     Preferences.debuggerAlwaysEnabled = true;
     Preferences.profilerAlwaysEnabled = true;
     Preferences.canEditScriptSource = true;
+    Preferences.onlineDetectionEnabled = false;
     if ("page" in WebInspector._paramsObject) {
         WebInspector.loadedDone = true;
         if (WebInspector.socketOpened)

-- 
WebKit Debian packaging