<!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>[212603] 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/212603">212603</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 22:57:42 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Use Maps in FrameResourceManager instead of objects
https://bugs.webkit.org/show_bug.cgi?id=168549
<rdar://problem/30590110>
Reviewed by Joseph Pecoraro.
Use Map for _frameIdentifierMap and _resourceRequestIdentifierMap.
* UserInterface/Controllers/FrameResourceManager.js:
(WebInspector.FrameResourceManager.prototype.initialize):
(WebInspector.FrameResourceManager.prototype.get frames):
(WebInspector.FrameResourceManager.prototype.frameForIdentifier):
(WebInspector.FrameResourceManager.prototype.frameDidDetach):
(WebInspector.FrameResourceManager.prototype.resourceRequestWillBeSent):
(WebInspector.FrameResourceManager.prototype.markResourceRequestAsServedFromMemoryCache):
(WebInspector.FrameResourceManager.prototype.resourceRequestWasServedFromMemoryCache):
(WebInspector.FrameResourceManager.prototype.resourceRequestDidReceiveResponse):
(WebInspector.FrameResourceManager.prototype.resourceRequestDidReceiveData):
(WebInspector.FrameResourceManager.prototype.resourceRequestDidFinishLoading):
(WebInspector.FrameResourceManager.prototype.resourceRequestDidFailLoading):
(WebInspector.FrameResourceManager.prototype._addNewResourceToFrameOrTarget):
(WebInspector.FrameResourceManager.prototype._processMainFrameResourceTreePayload):
(WebInspector.FrameResourceManager.prototype._createFrame):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersFrameResourceManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (212602 => 212603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-02-18 06:41:48 UTC (rev 212602)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-02-18 06:57:42 UTC (rev 212603)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-02-17 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Use Maps in FrameResourceManager instead of objects
+ https://bugs.webkit.org/show_bug.cgi?id=168549
+ <rdar://problem/30590110>
+
+ Reviewed by Joseph Pecoraro.
+
+ Use Map for _frameIdentifierMap and _resourceRequestIdentifierMap.
+
+ * UserInterface/Controllers/FrameResourceManager.js:
+ (WebInspector.FrameResourceManager.prototype.initialize):
+ (WebInspector.FrameResourceManager.prototype.get frames):
+ (WebInspector.FrameResourceManager.prototype.frameForIdentifier):
+ (WebInspector.FrameResourceManager.prototype.frameDidDetach):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestWillBeSent):
+ (WebInspector.FrameResourceManager.prototype.markResourceRequestAsServedFromMemoryCache):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestWasServedFromMemoryCache):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestDidReceiveResponse):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestDidReceiveData):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestDidFinishLoading):
+ (WebInspector.FrameResourceManager.prototype.resourceRequestDidFailLoading):
+ (WebInspector.FrameResourceManager.prototype._addNewResourceToFrameOrTarget):
+ (WebInspector.FrameResourceManager.prototype._processMainFrameResourceTreePayload):
+ (WebInspector.FrameResourceManager.prototype._createFrame):
+
</ins><span class="cx"> 2017-02-17 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: Inspector window should dock to the left when using RTL layout direction
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersFrameResourceManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js (212602 => 212603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2017-02-18 06:41:48 UTC (rev 212602)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2017-02-18 06:57:42 UTC (rev 212603)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> {
</span><span class="cx"> var oldMainFrame = this._mainFrame;
</span><span class="cx">
</span><del>- this._frameIdentifierMap = {};
</del><ins>+ this._frameIdentifierMap = new Map;
</ins><span class="cx"> this._mainFrame = null;
</span><del>- this._resourceRequestIdentifierMap = {};
</del><ins>+ this._resourceRequestIdentifierMap = new Map;
</ins><span class="cx"> this._orphanedResources = new Map;
</span><span class="cx">
</span><span class="cx"> if (this._mainFrame !== oldMainFrame)
</span><span class="lines">@@ -65,16 +65,12 @@
</span><span class="cx">
</span><span class="cx"> get frames()
</span><span class="cx"> {
</span><del>- var frames = [];
- for (var key in this._frameIdentifierMap)
- frames.push(this._frameIdentifierMap[key]);
-
- return frames;
</del><ins>+ return [...this._frameIdentifierMap.values()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> frameForIdentifier(frameId)
</span><span class="cx"> {
</span><del>- return this._frameIdentifierMap[frameId] || null;
</del><ins>+ return this._frameIdentifierMap.get(frameId) || null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> frameDidNavigate(framePayload)
</span><span class="lines">@@ -155,7 +151,7 @@
</span><span class="cx"> if (frame.parentFrame)
</span><span class="cx"> frame.parentFrame.removeChildFrame(frame);
</span><span class="cx">
</span><del>- delete this._frameIdentifierMap[frame.id];
</del><ins>+ this._frameIdentifierMap.delete(frame.id);
</ins><span class="cx">
</span><span class="cx"> var oldMainFrame = this._mainFrame;
</span><span class="cx">
</span><span class="lines">@@ -186,7 +182,7 @@
</span><span class="cx"> var originalRequestWillBeSentTimestamp = timestamp;
</span><span class="cx">
</span><span class="cx"> var elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx"> if (resource) {
</span><span class="cx"> // This is an existing request which is being redirected, update the resource.
</span><span class="cx"> console.assert(redirectResponse);
</span><span class="lines">@@ -201,7 +197,7 @@
</span><span class="cx"> resource = this._addNewResourceToFrameOrTarget(requestIdentifier, frameIdentifier, loaderIdentifier, request.url, type, request.method, request.headers, request.postData, elapsedTime, null, null, initiatorSourceCodeLocation, originalRequestWillBeSentTimestamp, targetId);
</span><span class="cx">
</span><span class="cx"> // Associate the resource with the requestIdentifier so it can be found in future loading events.
</span><del>- this._resourceRequestIdentifierMap[requestIdentifier] = resource;
</del><ins>+ this._resourceRequestIdentifierMap.set(requestIdentifier, resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> markResourceRequestAsServedFromMemoryCache(requestIdentifier)
</span><span class="lines">@@ -212,7 +208,7 @@
</span><span class="cx"> if (this._waitingForMainFrameResourceTreePayload)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx">
</span><span class="cx"> // We might not have a resource if the inspector was opened during the page load (after resourceRequestWillBeSent is called).
</span><span class="cx"> // We don't want to assert in this case since we do likely have the resource, via PageAgent.getResourceTree. The Resource
</span><span class="lines">@@ -231,7 +227,7 @@
</span><span class="cx"> if (this._waitingForMainFrameResourceTreePayload)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- console.assert(!(requestIdentifier in this._resourceRequestIdentifierMap));
</del><ins>+ console.assert(!this._resourceRequestIdentifierMap.has(requestIdentifier));
</ins><span class="cx">
</span><span class="cx"> var elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
</span><span class="cx"> var initiatorSourceCodeLocation = this._initiatorSourceCodeLocationFromPayload(initiator);
</span><span class="lines">@@ -259,7 +255,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx">
</span><span class="cx"> // We might not have a resource if the inspector was opened during the page load (after resourceRequestWillBeSent is called).
</span><span class="cx"> // We don't want to assert in this case since we do likely have the resource, via PageAgent.getResourceTree. The Resource
</span><span class="lines">@@ -273,7 +269,7 @@
</span><span class="cx"> // Associate the resource with the requestIdentifier so it can be found in future loading events.
</span><span class="cx"> // and roll it back to an unfinished state, we know now it is still loading.
</span><span class="cx"> if (resource) {
</span><del>- this._resourceRequestIdentifierMap[requestIdentifier] = resource;
</del><ins>+ this._resourceRequestIdentifierMap.set(requestIdentifier, resource);
</ins><span class="cx"> resource.revertMarkAsFinished();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -284,7 +280,7 @@
</span><span class="cx"> resource = this._addNewResourceToFrameOrTarget(requestIdentifier, frameIdentifier, loaderIdentifier, response.url, type, null, response.requestHeaders, null, elapsedTime, null, null, null);
</span><span class="cx">
</span><span class="cx"> // Associate the resource with the requestIdentifier so it can be found in future loading events.
</span><del>- this._resourceRequestIdentifierMap[requestIdentifier] = resource;
</del><ins>+ this._resourceRequestIdentifierMap.set(requestIdentifier, resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (response.fromDiskCache)
</span><span class="lines">@@ -301,7 +297,7 @@
</span><span class="cx"> if (this._waitingForMainFrameResourceTreePayload)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx"> var elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
</span><span class="cx">
</span><span class="cx"> // We might not have a resource if the inspector was opened during the page load (after resourceRequestWillBeSent is called).
</span><span class="lines">@@ -326,7 +322,7 @@
</span><span class="cx">
</span><span class="cx"> // By now we should always have the Resource. Either it was fetched when the inspector first opened with
</span><span class="cx"> // PageAgent.getResourceTree, or it was a currently loading resource that we learned about in resourceRequestDidReceiveResponse.
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx"> console.assert(resource);
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="lines">@@ -337,7 +333,7 @@
</span><span class="cx"> if (sourceMapURL)
</span><span class="cx"> WebInspector.sourceMapManager.downloadSourceMap(sourceMapURL, resource.url, resource);
</span><span class="cx">
</span><del>- delete this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ this._resourceRequestIdentifierMap.delete(requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> resourceRequestDidFailLoading(requestIdentifier, canceled, timestamp)
</span><span class="lines">@@ -350,7 +346,7 @@
</span><span class="cx">
</span><span class="cx"> // By now we should always have the Resource. Either it was fetched when the inspector first opened with
</span><span class="cx"> // PageAgent.getResourceTree, or it was a currently loading resource that we learned about in resourceRequestDidReceiveResponse.
</span><del>- var resource = this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ let resource = this._resourceRequestIdentifierMap.get(requestIdentifier);
</ins><span class="cx"> console.assert(resource);
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="lines">@@ -361,7 +357,7 @@
</span><span class="cx"> if (resource === resource.parentFrame.provisionalMainResource)
</span><span class="cx"> resource.parentFrame.clearProvisionalLoad();
</span><span class="cx">
</span><del>- delete this._resourceRequestIdentifierMap[requestIdentifier];
</del><ins>+ this._resourceRequestIdentifierMap.delete(requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> executionContextCreated(contextPayload)
</span><span class="lines">@@ -428,7 +424,7 @@
</span><span class="cx"> console.assert(!targetId);
</span><span class="cx"> resource = new WebInspector.Resource(url, null, type, loaderIdentifier, targetId, requestIdentifier, requestMethod, requestHeaders, requestData, elapsedTime, initiatorSourceCodeLocation, originalRequestWillBeSentTimestamp);
</span><span class="cx"> frame = new WebInspector.Frame(frameIdentifier, frameName, frameSecurityOrigin, loaderIdentifier, resource);
</span><del>- this._frameIdentifierMap[frame.id] = frame;
</del><ins>+ this._frameIdentifierMap.set(frame.id, frame);
</ins><span class="cx">
</span><span class="cx"> // If we don't have a main frame, assume this is it. This can change later in
</span><span class="cx"> // frameDidNavigate when the parent frame is known.
</span><span class="lines">@@ -532,8 +528,8 @@
</span><span class="cx"> console.assert(mainFramePayload);
</span><span class="cx"> console.assert(mainFramePayload.frame);
</span><span class="cx">
</span><del>- this._resourceRequestIdentifierMap = {};
- this._frameIdentifierMap = {};
</del><ins>+ this._resourceRequestIdentifierMap = new Map;
+ this._frameIdentifierMap = new Map;
</ins><span class="cx">
</span><span class="cx"> var oldMainFrame = this._mainFrame;
</span><span class="cx">
</span><span class="lines">@@ -550,7 +546,7 @@
</span><span class="cx"> var mainResource = new WebInspector.Resource(payload.url || "about:blank", payload.mimeType, null, payload.loaderId);
</span><span class="cx"> var frame = new WebInspector.Frame(payload.id, payload.name, payload.securityOrigin, payload.loaderId, mainResource);
</span><span class="cx">
</span><del>- this._frameIdentifierMap[frame.id] = frame;
</del><ins>+ this._frameIdentifierMap.set(frame.id, frame);
</ins><span class="cx">
</span><span class="cx"> mainResource.markAsFinished();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>