<!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>[180788] trunk/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/180788">180788</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-27 15:35:12 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Use Maps in ResourceCollection instead of objects
https://bugs.webkit.org/show_bug.cgi?id=142101
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-27
Reviewed by Timothy Hatcher.
* UserInterface/Models/ResourceCollection.js:
(WebInspector.ResourceCollection):
(WebInspector.ResourceCollection.prototype.resourcesWithType):
(WebInspector.ResourceCollection.prototype.removeAllResources):
(WebInspector.ResourceCollection.prototype.resourceForURL):
(WebInspector.ResourceCollection.prototype._associateWithResource):
(WebInspector.ResourceCollection.prototype._disassociateWithResource):
(WebInspector.ResourceCollection.prototype._resourceURLDidChange):
(WebInspector.ResourceCollection.prototype._resourceTypeDidChange):
Use Maps instead of objects.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs">trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (180787 => 180788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-27 23:32:03 UTC (rev 180787)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-27 23:35:12 UTC (rev 180788)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-27 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Use Maps in ResourceCollection instead of objects
+ https://bugs.webkit.org/show_bug.cgi?id=142101
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/ResourceCollection.js:
+ (WebInspector.ResourceCollection):
+ (WebInspector.ResourceCollection.prototype.resourcesWithType):
+ (WebInspector.ResourceCollection.prototype.removeAllResources):
+ (WebInspector.ResourceCollection.prototype.resourceForURL):
+ (WebInspector.ResourceCollection.prototype._associateWithResource):
+ (WebInspector.ResourceCollection.prototype._disassociateWithResource):
+ (WebInspector.ResourceCollection.prototype._resourceURLDidChange):
+ (WebInspector.ResourceCollection.prototype._resourceTypeDidChange):
+ Use Maps instead of objects.
+
</ins><span class="cx"> 2015-02-26 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add a subtle blue background for selected console messages
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js (180787 => 180788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js 2015-02-27 23:32:03 UTC (rev 180787)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js 2015-02-27 23:35:12 UTC (rev 180788)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> WebInspector.Object.call(this);
</span><span class="cx">
</span><span class="cx"> this._resources = [];
</span><del>- this._resourceURLMap = {};
- this._resourcesTypeMap = {};
</del><ins>+ this._resourceURLMap = new Map;
+ this._resourcesTypeMap = new Map;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ResourceCollection.prototype = {
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx">
</span><span class="cx"> resourceForURL: function(url)
</span><span class="cx"> {
</span><del>- return this._resourceURLMap[url] || null;
</del><ins>+ return this._resourceURLMap.get(url) || null;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> resourcesWithType: function(type)
</span><span class="cx"> {
</span><del>- return this._resourcesTypeMap[type] || [];
</del><ins>+ return this._resourcesTypeMap.get(type) || [];
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addResource: function(resource)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> this._disassociateWithResource(this._resources[i], true);
</span><span class="cx">
</span><span class="cx"> this._resources = [];
</span><del>- this._resourceURLMap = {};
- this._resourcesTypeMap = {};
</del><ins>+ this._resourceURLMap.clear();
+ this._resourcesTypeMap.clear();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -101,11 +101,12 @@
</span><span class="cx"> _associateWithResource: function(resource)
</span><span class="cx"> {
</span><span class="cx"> this._resources.push(resource);
</span><del>- this._resourceURLMap[resource.url] = resource;
</del><ins>+ this._resourceURLMap.set(resource.url, resource);
</ins><span class="cx">
</span><del>- if (!this._resourcesTypeMap[resource.type])
- this._resourcesTypeMap[resource.type] = [];
- this._resourcesTypeMap[resource.type].push(resource);
</del><ins>+ if (!this._resourcesTypeMap.has(resource.type))
+ this._resourcesTypeMap.set(resource.type, [resource]);
+ else
+ this._resourcesTypeMap.get(resource.type).push(resource);
</ins><span class="cx">
</span><span class="cx"> resource.addEventListener(WebInspector.Resource.Event.URLDidChange, this._resourceURLDidChange, this);
</span><span class="cx"> resource.addEventListener(WebInspector.Resource.Event.TypeDidChange, this._resourceTypeDidChange, this);
</span><span class="lines">@@ -115,9 +116,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (skipRemoval) {
</span><span class="cx"> this._resources.remove(resource);
</span><del>- if (this._resourcesTypeMap[resource.type])
- this._resourcesTypeMap[resource.type].remove(resource);
- delete this._resourceURLMap[resource.url];
</del><ins>+ if (this._resourcesTypeMap.has(resource.type))
+ this._resourcesTypeMap.get(resource.type).remove(resource);
+ this._resourceURLMap.delete(resource.url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> resource.removeEventListener(WebInspector.Resource.Event.URLDidChange, this._resourceURLDidChange, this);
</span><span class="lines">@@ -136,8 +137,8 @@
</span><span class="cx"> if (!oldURL)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._resourceURLMap[resource.url] = resource;
- delete this._resourceURLMap[oldURL];
</del><ins>+ this._resourceURLMap.set(resource.url, resource);
+ this._resourceURLMap.delete(oldURL);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _resourceTypeDidChange: function(event)
</span><span class="lines">@@ -152,12 +153,13 @@
</span><span class="cx"> if (!oldType)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!this._resourcesTypeMap[resource.type])
- this._resourcesTypeMap[resource.type] = [];
- this._resourcesTypeMap[resource.type].push(resource);
</del><ins>+ if (!this._resourcesTypeMap.has(resource.type))
+ this._resourcesTypeMap.set(resource.type, [resource]);
+ else
+ this._resourcesTypeMap.get(resource.type).push(resource);
</ins><span class="cx">
</span><del>- if (this._resourcesTypeMap[oldType])
- this._resourcesTypeMap[oldType].remove(resource);
</del><ins>+ if (this._resourcesTypeMap.has(oldType))
+ this._resourcesTypeMap.get(oldType).remove(resource);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>