[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit f13c21d56b7a8339979d2cbafc1f3b7160dda936
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 18:06:08 2010 +0000

    2010-02-04  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: group cookies by domains, not frame's domains.
    
            https://bugs.webkit.org/show_bug.cgi?id=34599
    
            * inspector/front-end/CookieItemsView.js:
            (WebInspector.CookieItemsView.prototype._cookiesForDomain):
            * inspector/front-end/inspector.js:
            (WebInspector.updateResource):
            (WebInspector._addCookieDomain):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 034c095..e6eb5fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-04  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: group cookies by domains, not frame's domains.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34599
+
+        * inspector/front-end/CookieItemsView.js:
+        (WebInspector.CookieItemsView.prototype._cookiesForDomain):
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+        (WebInspector._addCookieDomain):
+
 2010-02-04  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/front-end/CookieItemsView.js b/WebCore/inspector/front-end/CookieItemsView.js
index b31b7ea..e4d6018 100644
--- a/WebCore/inspector/front-end/CookieItemsView.js
+++ b/WebCore/inspector/front-end/CookieItemsView.js
@@ -96,7 +96,7 @@ WebInspector.CookieItemsView.prototype = {
 
         for (var id in WebInspector.resources) {
             var resource = WebInspector.resources[id];
-            var match = resource.documentURL.match(WebInspector.URLRegExp);
+            var match = resource.url.match(WebInspector.URLRegExp);
             if (match && match[2] === this._cookieDomain)
                 resourceURLsForDocumentURL.push(resource.url);
         }
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index de20739..ccd3d00 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1046,12 +1046,7 @@ WebInspector.updateResource = function(identifier, payload)
         if (resource.mainResource)
             this.mainResource = resource;
 
-        var match = payload.documentURL.match(WebInspector.URLRegExp);
-        if (match) {
-            var protocol = match[1].toLowerCase();
-            if (protocol.indexOf("http") === 0 || protocol === "file")
-                this.addCookieDomain(protocol === "file" ? "" : match[2]);
-        }
+        this._addCookieDomain(resource.domain);
     }
 
     if (payload.didResponseChange) {
@@ -1131,7 +1126,7 @@ WebInspector.addDatabase = function(payload)
     this.panels.storage.addDatabase(database);
 }
 
-WebInspector.addCookieDomain = function(domain)
+WebInspector._addCookieDomain = function(domain)
 {
     // Eliminate duplicate domains from the list.
     if (domain in this.cookieDomains)

-- 
WebKit Debian packaging