Changeset 192614 in webkit

Timestamp:

Nov 18, 2015, 10:27:21 PM (10 years ago)

Author:

BJ Burg

Message:

Web Inspector: move cookie url matching out of CookieStorageContentView and clean up some code
​https://bugs.webkit.org/show_bug.cgi?id=151424

Reviewed by Timothy Hatcher.

Move the code that decides whether a cookie matches a resource URL to a model class.
This will make it possible to test this code easily without pulling Views into tests.

• UserInterface/Models/CookieStorageObject.js:

(WebInspector.CookieStorageObject.cookieMatchesResourceURL):
(WebInspector.CookieStorageObject.cookieDomainMatchesResourceDomain):
(WebInspector.CookieStorageObject.prototype.saveIdentityToCookie):
(WebInspector.CookieStorageObject):

• UserInterface/Views/CookieStorageContentView.js:

(WebInspector.CookieStorageContentView.prototype.update): use Promises.
(WebInspector.CookieStorageContentView.prototype._rebuildTable):
(WebInspector.CookieStorageContentView.prototype._filterCookies):

Use Array.filter() and Array.some() to express this logic more directly.

(WebInspector.CookieStorageContentView.cookieMatchesResourceURL): Deleted.
(WebInspector.CookieStorageContentView.cookieDomainMatchesResourceDomain): Deleted.
(WebInspector.CookieStorageContentView.prototype.update.callback): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CookieStorageObject.js (modified) (3 diffs)
• UserInterface/Views/CookieStorageContentView.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-11-18  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: move cookie url matching out of CookieStorageContentView and clean up some code
+        https://bugs.webkit.org/show_bug.cgi?id=151424
+
+        Reviewed by Timothy Hatcher.
+
+        Move the code that decides whether a cookie matches a resource URL to a model class.
+        This will make it possible to test this code easily without pulling Views into tests.
+
+        * UserInterface/Models/CookieStorageObject.js:
+        (WebInspector.CookieStorageObject.cookieMatchesResourceURL):
+        (WebInspector.CookieStorageObject.cookieDomainMatchesResourceDomain):
+        (WebInspector.CookieStorageObject.prototype.saveIdentityToCookie):
+        (WebInspector.CookieStorageObject):
+        * UserInterface/Views/CookieStorageContentView.js:
+        (WebInspector.CookieStorageContentView.prototype.update): use Promises.
+        (WebInspector.CookieStorageContentView.prototype._rebuildTable):
+        (WebInspector.CookieStorageContentView.prototype._filterCookies):
+
+            Use Array.filter() and Array.some() to express this logic more directly.
+
+        (WebInspector.CookieStorageContentView.cookieMatchesResourceURL): Deleted.
+        (WebInspector.CookieStorageContentView.cookieDomainMatchesResourceDomain): Deleted.
+        (WebInspector.CookieStorageContentView.prototype.update.callback): Deleted.
+
 2015-11-18  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +31 @@
     }
 
+    // Static
+
+    static cookieMatchesResourceURL(cookie, resourceURL)
+    {
+        var parsedURL = parseURL(resourceURL);
+        if (!parsedURL || !WebInspector.CookieStorageObject.cookieDomainMatchesResourceDomain(cookie.domain, parsedURL.host))
+            return false;
+
+        return (parsedURL.path.startsWith(cookie.path)
+            && (!cookie.port || parsedURL.port === cookie.port)
+            && (!cookie.secure || parsedURL.scheme === "https"));
+    }
+
+    static cookieDomainMatchesResourceDomain(cookieDomain, resourceDomain)
+    {
+        if (cookieDomain.charAt(0) !== ".")
+            return resourceDomain === cookieDomain;
+        return !!resourceDomain.match(new RegExp("^([^\\.]+\\.)?" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
+    }
+
     // Public
 
@@ -40 +60 @@
     saveIdentityToCookie(cookie)
     {
-        // FIXME: This class will need to look up cookies that are set for this host.
+        // FIXME <https://webkit.org/b/151413>: This class should actually store cookie data for this host.
         cookie[WebInspector.CookieStorageObject.CookieHostCookieKey] = this.host;
     }    

trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js

@@ -38 +38 @@
     }
 
-    // Static
-
-    static cookieMatchesResourceURL(cookie, resourceURL)
-    {
-        var parsedURL = parseURL(resourceURL);
-        if (!parsedURL || !WebInspector.CookieStorageContentView.cookieDomainMatchesResourceDomain(cookie.domain, parsedURL.host))
-            return false;
-
-        return (parsedURL.path.startsWith(cookie.path)
-            && (!cookie.port || parsedURL.port === cookie.port)
-            && (!cookie.secure || parsedURL.scheme === "https"));
-    }
-
-    static cookieDomainMatchesResourceDomain(cookieDomain, resourceDomain)
-    {
-        if (cookieDomain.charAt(0) !== ".")
-            return resourceDomain === cookieDomain;
-        return !!resourceDomain.match(new RegExp("^([^\\.]+\\.)?" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
-    }
-
     // Public
 
@@ -67 +47 @@
     update()
     {
-        function callback(error, cookies)
-        {
-            if (error)
-                return;
-
-            this._cookies = this._filterCookies(cookies);
+        PageAgent.getCookies().then((payload) => {
+            this._cookies = this._filterCookies(payload.cookies);
             this._rebuildTable();
-        }
-
-        PageAgent.getCookies(callback.bind(this));
+        }).catch((error) => {
+            console.error("Could not fetch cookies: ", error);
+        });
     }
 
@@ -96 +72 @@
     _rebuildTable()
     {
-        // FIXME: If there are no cookies, do we want to show an empty datagrid, or do something like the old
-        // inspector and show some text saying there are no cookies?
+        // FIXME <https://webkit.org/b/151400>: If there are no cookies, add placeholder explanatory text.
         if (!this._dataGrid) {
             var columns = {name: {}, value: {}, domain: {}, path: {}, expires: {}, size: {}, http: {}, secure: {}};
@@ -173 +148 @@
     _filterCookies(cookies)
     {
-        var filteredCookies = [];
-        var resourcesForDomain = [];
-
-        var frames = WebInspector.frameResourceManager.frames;
-        for (var i = 0; i < frames.length; ++i) {
-            var resources = frames[i].resources;
-            for (var j = 0; j < resources.length; ++j) {
-                var urlComponents = resources[j].urlComponents;
-                if (urlComponents && urlComponents.host && urlComponents.host === this.representedObject.host)
-                    resourcesForDomain.push(resources[j].url);
-            }
-
-            // The main resource isn't always in the list of resources, make sure to add it to the list of resources
-            // we get the URLs from.
-            var mainResourceURLComponents = frames[i].mainResource.urlComponents;
-            if (mainResourceURLComponents && mainResourceURLComponents.host && mainResourceURLComponents.host === this.representedObject.host)
-                resourcesForDomain.push(frames[i].mainResource.url);
-        }
-
-        for (var i = 0; i < cookies.length; ++i) {
-            for (var j = 0; j < resourcesForDomain.length; ++j) {
-                if (WebInspector.CookieStorageContentView.cookieMatchesResourceURL(cookies[i], resourcesForDomain[j])) {
-                    filteredCookies.push(cookies[i]);
-                    break;
-                }
-            }
-        }
-
-        return filteredCookies;
+        let resourceMatchesStorageDomain = (resource) => {
+            let urlComponents = resource.urlComponents;
+            return urlComponents && urlComponents.host && urlComponents.host === this.representedObject.host;
+        }
+
+        let allResources = [];
+        for (let frame of WebInspector.frameResourceManager.frames) {
+            // The main resource isn't in the list of resources, so add it as a candidate.
+            allResources.push(frame.mainResource);
+            allResources = allResources.concat(frame.resources);
+        }
+
+        let resourcesForDomain = allResources.filter(resourceMatchesStorageDomain);
+
+        let cookiesForDomain = cookies.filter((cookie) => {
+            return resourcesForDomain.some((resource) => {
+                return WebInspector.CookieStorageObject.cookieMatchesResourceURL(cookie, resource.url);
+            });
+        });
+        return cookiesForDomain;
     }