[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 034f3c134bec0f6488803e0e8754fdb000898a45
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 20:27:54 2009 +0000

    Fixes <http://webkit.org/b/30233>
    Local Storage and Cookies show Blank Titles on Local Files.
    
    Reviewed by Timothy Hatcher.
    
    If a local storage or cookies sidebar item has no domain, set the
    title to "Local Files", because that is what it represents.
    
    * English.lproj/localizedStrings.js:
    * inspector/front-end/StoragePanel.js:
    (WebInspector.DOMStorageSidebarTreeElement.prototype.get mainTitle):
    (WebInspector.CookieSidebarTreeElement.prototype.get mainTitle):
    (WebInspector.CookieSidebarTreeElement.prototype.set mainTitle):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49314 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 15d551c..698bec9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-08  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Fixes <http://webkit.org/b/30233>
+        Local Storage and Cookies show Blank Titles on Local Files.
+
+        If a local storage or cookies sidebar item has no domain, set the 
+        title to "Local Files", because that is what it represents.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/StoragePanel.js:
+        (WebInspector.DOMStorageSidebarTreeElement.prototype.get mainTitle):
+        (WebInspector.CookieSidebarTreeElement.prototype.get mainTitle):
+        (WebInspector.CookieSidebarTreeElement.prototype.set mainTitle):
+
 2009-10-08  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 3e6db09..b024652 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index 089bb98..66b4a92 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -558,7 +558,7 @@ WebInspector.DOMStorageSidebarTreeElement.prototype = {
 
     get mainTitle()
     {
-        return this.domStorage.domain;
+        return this.domStorage.domain ? this.domStorage.domain : WebInspector.UIString("Local Files");
     },
 
     set mainTitle(x)
@@ -592,6 +592,16 @@ WebInspector.CookieSidebarTreeElement.prototype = {
     {
         WebInspector.panels.storage.showCookies(this._cookieDomain);
     },
+    
+    get mainTitle()
+    {
+        return this._cookieDomain ? this._cookieDomain : WebInspector.UIString("Local Files");
+    },
+
+    set mainTitle(x)
+    {
+        // Do nothing.
+    },
 
     get subtitle()
     {

-- 
WebKit Debian packaging