<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193327] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193327">193327</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:11:05 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192614">r192614</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193326 => 193327)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:10:59 UTC (rev 193326)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:11:05 UTC (rev 193327)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192614. rdar://problem/23221163
+
+ 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-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192613. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-18 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js (193326 => 193327)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-12-03 19:10:59 UTC (rev 193326)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-12-03 19:11:05 UTC (rev 193327)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,6 +30,26 @@
</span><span class="cx"> this._host = host;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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");
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get host()
</span><span class="lines">@@ -39,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> saveIdentityToCookie(cookie)
</span><span class="cx"> {
</span><del>- // FIXME: This class will need to look up cookies that are set for this host.
</del><ins>+ // FIXME <https://webkit.org/b/151413>: This class should actually store cookie data for this host.
</ins><span class="cx"> cookie[WebInspector.CookieStorageObject.CookieHostCookieKey] = this.host;
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (193326 => 193327)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-12-03 19:10:59 UTC (rev 193326)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-12-03 19:11:05 UTC (rev 193327)
</span><span class="lines">@@ -37,26 +37,6 @@
</span><span class="cx"> this.update();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 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");
- }
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="lines">@@ -66,16 +46,12 @@
</span><span class="cx">
</span><span class="cx"> update()
</span><span class="cx"> {
</span><del>- function callback(error, cookies)
- {
- if (error)
- return;
-
- this._cookies = this._filterCookies(cookies);
</del><ins>+ PageAgent.getCookies().then((payload) => {
+ this._cookies = this._filterCookies(payload.cookies);
</ins><span class="cx"> this._rebuildTable();
</span><del>- }
-
- PageAgent.getCookies(callback.bind(this));
</del><ins>+ }).catch((error) => {
+ console.error("Could not fetch cookies: ", error);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> saveToCookie(cookie)
</span><span class="lines">@@ -95,8 +71,7 @@
</span><span class="cx">
</span><span class="cx"> _rebuildTable()
</span><span class="cx"> {
</span><del>- // 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?
</del><ins>+ // FIXME <https://webkit.org/b/151400>: If there are no cookies, add placeholder explanatory text.
</ins><span class="cx"> if (!this._dataGrid) {
</span><span class="cx"> var columns = {name: {}, value: {}, domain: {}, path: {}, expires: {}, size: {}, http: {}, secure: {}};
</span><span class="cx">
</span><span class="lines">@@ -172,35 +147,26 @@
</span><span class="cx">
</span><span class="cx"> _filterCookies(cookies)
</span><span class="cx"> {
</span><del>- 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);
</del><ins>+ var resourceMatchesStorageDomain = (resource) => {
+ var urlComponents = resource.urlComponents;
+ return urlComponents && urlComponents.host && urlComponents.host === this.representedObject.host;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
- }
</del><ins>+ var allResources = [];
+ for (var 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);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return filteredCookies;
</del><ins>+ var resourcesForDomain = allResources.filter(resourceMatchesStorageDomain);
+
+ var cookiesForDomain = cookies.filter((cookie) => {
+ return resourcesForDomain.some((resource) => {
+ return WebInspector.CookieStorageObject.cookieMatchesResourceURL(cookie, resource.url);
+ });
+ });
+ return cookiesForDomain;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _sortDataGrid()
</span></span></pre>
</div>
</div>
</body>
</html>