<!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>[193245] 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/193245">193245</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:01:31 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190540">r190540</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.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 (193244 => 193245)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:26 UTC (rev 193244)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:31 UTC (rev 193245)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190540. rdar://problem/23221163
+
+ 2015-10-02 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Cleanup DebuggerManager, reduce `delete` and use Maps instead of objects
+ https://bugs.webkit.org/show_bug.cgi?id=149760
+
+ Reviewed by Joseph Pecoraro.
+
+ Replaced objects used as hashmaps with Map.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.breakpointsForSourceCode):
+ (WebInspector.DebuggerManager.prototype.breakpointForIdentifier):
+ (WebInspector.DebuggerManager.prototype.scriptForIdentifier):
+ (WebInspector.DebuggerManager.prototype.scriptsForURL):
+ (WebInspector.DebuggerManager.prototype.get knownNonResourceScripts):
+ (WebInspector.DebuggerManager.prototype.removeBreakpoint):
+ (WebInspector.DebuggerManager.prototype.breakpointResolved):
+ (WebInspector.DebuggerManager.prototype.reset):
+ (WebInspector.DebuggerManager.prototype.scriptDidParse):
+ (WebInspector.DebuggerManager.prototype._sourceCodeLocationFromPayload):
+ (WebInspector.DebuggerManager.prototype._setBreakpoint.didSetBreakpoint):
+ (WebInspector.DebuggerManager.prototype._setBreakpoint):
+ (WebInspector.DebuggerManager.prototype._removeBreakpoint.didRemoveBreakpoint):
+ (WebInspector.DebuggerManager.prototype._removeBreakpoint):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r190528. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-10-02 Devin Rousso <dcrousso+webkit@gmail.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (193244 => 193245)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 19:01:26 UTC (rev 193244)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 19:01:31 UTC (rev 193245)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> this._allUncaughtExceptionsBreakpoint = new WebInspector.Breakpoint(specialBreakpointLocation, !this._allUncaughtExceptionsBreakpointEnabledSetting.value);
</span><span class="cx">
</span><span class="cx"> this._breakpoints = [];
</span><del>- this._breakpointURLMap = {};
- this._breakpointScriptIdentifierMap = {};
- this._breakpointIdMap = {};
</del><ins>+ this._breakpointURLMap = new Map;
+ this._breakpointScriptIdentifierMap = new Map;
+ this._breakpointIdMap = new Map;
</ins><span class="cx">
</span><span class="cx"> this._nextBreakpointActionIdentifier = 1;
</span><span class="cx">
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> this._pauseReason = null;
</span><span class="cx"> this._pauseData = null;
</span><span class="cx">
</span><del>- this._scriptIdMap = {};
- this._scriptURLMap = {};
</del><ins>+ this._scriptIdMap = new Map;
+ this._scriptURLMap = new Map;
</ins><span class="cx">
</span><span class="cx"> this._breakpointsSetting = new WebInspector.Setting("breakpoints", []);
</span><span class="cx"> this._breakpointsEnabledSetting = new WebInspector.Setting("breakpoints-enabled", true);
</span><span class="lines">@@ -276,16 +276,18 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sourceCode.url in this._breakpointURLMap) {
- var urlBreakpoint = this._breakpointURLMap[sourceCode.url] || [];
- this._associateBreakpointsWithSourceCode(urlBreakpoint, sourceCode);
- return urlBreakpoint;
</del><ins>+ var urlBreakpoints = this._breakpointURLMap.get(sourceCode.url);
+ if (urlBreakpoints) {
+ this._associateBreakpointsWithSourceCode(urlBreakpoints, sourceCode);
+ return urlBreakpoints;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (sourceCode instanceof WebInspector.Script && sourceCode.id in this._breakpointScriptIdentifierMap) {
- var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap[sourceCode.id] || [];
- this._associateBreakpointsWithSourceCode(scriptIdentifierBreakpoints, sourceCode);
- return scriptIdentifierBreakpoints;
</del><ins>+ if (sourceCode instanceof WebInspector.Script) {
+ var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap.get(sourceCode.id);
+ if (scriptIdentifierBreakpoints) {
+ this._associateBreakpointsWithSourceCode(scriptIdentifierBreakpoints, sourceCode);
+ return scriptIdentifierBreakpoints;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return [];
</span><span class="lines">@@ -293,18 +295,18 @@
</span><span class="cx">
</span><span class="cx"> breakpointForIdentifier(id)
</span><span class="cx"> {
</span><del>- return this._breakpointIdMap[id];
</del><ins>+ return this._breakpointIdMap.get(id) || null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> scriptForIdentifier(id)
</span><span class="cx"> {
</span><del>- return this._scriptIdMap[id] || null;
</del><ins>+ return this._scriptIdMap.get(id) || null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> scriptsForURL(url)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This may not be safe. A Resource's URL may differ from a Script's URL.
</span><del>- return this._scriptURLMap[url] || [];
</del><ins>+ return this._scriptURLMap.get(url) || [];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> continueToLocation(scriptIdentifier, lineNumber, columnNumber)
</span><span class="lines">@@ -315,8 +317,7 @@
</span><span class="cx"> get knownNonResourceScripts()
</span><span class="cx"> {
</span><span class="cx"> var knownScripts = [];
</span><del>- for (var id in this._scriptIdMap) {
- var script = this._scriptIdMap[id];
</del><ins>+ for (var script of this._scriptIdMap.values()) {
</ins><span class="cx"> if (script.resource)
</span><span class="cx"> continue;
</span><span class="cx"> if (script.url && script.url.startsWith("__WebInspector"))
</span><span class="lines">@@ -334,16 +335,20 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (breakpoint.url) {
</span><del>- var urlBreakpoints = this._breakpointURLMap[breakpoint.url];
- if (!urlBreakpoints)
- urlBreakpoints = this._breakpointURLMap[breakpoint.url] = [];
</del><ins>+ var urlBreakpoints = this._breakpointURLMap.get(breakpoint.url);
+ if (!urlBreakpoints) {
+ urlBreakpoints = [];
+ this._breakpointURLMap.set(breakpoint.url, urlBreakpoints);
+ }
</ins><span class="cx"> urlBreakpoints.push(breakpoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (breakpoint.scriptIdentifier) {
</span><del>- var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap[breakpoint.scriptIdentifier];
- if (!scriptIdentifierBreakpoints)
- scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap[breakpoint.scriptIdentifier] = [];
</del><ins>+ var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap.get(breakpoint.scriptIdentifier);
+ if (!scriptIdentifierBreakpoints) {
+ scriptIdentifierBreakpoints = [];
+ this._breakpointScriptIdentifierMap.set(breakpoint.scriptIdentifier, scriptIdentifierBreakpoints);
+ }
</ins><span class="cx"> scriptIdentifierBreakpoints.push(breakpoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -376,20 +381,20 @@
</span><span class="cx"> this._removeBreakpoint(breakpoint);
</span><span class="cx">
</span><span class="cx"> if (breakpoint.url) {
</span><del>- var urlBreakpoints = this._breakpointURLMap[breakpoint.url];
</del><ins>+ var urlBreakpoints = this._breakpointURLMap.get(breakpoint.url);
</ins><span class="cx"> if (urlBreakpoints) {
</span><span class="cx"> urlBreakpoints.remove(breakpoint);
</span><span class="cx"> if (!urlBreakpoints.length)
</span><del>- delete this._breakpointURLMap[breakpoint.url];
</del><ins>+ this._breakpointURLMap.delete(breakpoint.url);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (breakpoint.scriptIdentifier) {
</span><del>- var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap[breakpoint.scriptIdentifier];
</del><ins>+ var scriptIdentifierBreakpoints = this._breakpointScriptIdentifierMap.get(breakpoint.scriptIdentifier);
</ins><span class="cx"> if (scriptIdentifierBreakpoints) {
</span><span class="cx"> scriptIdentifierBreakpoints.remove(breakpoint);
</span><span class="cx"> if (!scriptIdentifierBreakpoints.length)
</span><del>- delete this._breakpointScriptIdentifierMap[breakpoint.scriptIdentifier];
</del><ins>+ this._breakpointScriptIdentifierMap.delete(breakpoint.scriptIdentifier);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -404,7 +409,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Called from WebInspector.DebuggerObserver.
</span><span class="cx">
</span><del>- var breakpoint = this._breakpointIdMap[breakpointIdentifier];
</del><ins>+ var breakpoint = this._breakpointIdMap.get(breakpointIdentifier);
</ins><span class="cx"> console.assert(breakpoint);
</span><span class="cx"> if (!breakpoint)
</span><span class="cx"> return;
</span><span class="lines">@@ -431,8 +436,8 @@
</span><span class="cx"> this._pauseReason = null;
</span><span class="cx"> this._pauseData = null;
</span><span class="cx">
</span><del>- this._scriptIdMap = {};
- this._scriptURLMap = {};
</del><ins>+ this._scriptIdMap.clear();
+ this._scriptURLMap.clear();
</ins><span class="cx">
</span><span class="cx"> this._ignoreBreakpointDisplayLocationDidChangeEvent = true;
</span><span class="cx">
</span><span class="lines">@@ -512,23 +517,26 @@
</span><span class="cx"> scriptDidParse(scriptIdentifier, url, isContentScript, startLine, startColumn, endLine, endColumn, sourceMapURL)
</span><span class="cx"> {
</span><span class="cx"> // Don't add the script again if it is already known.
</span><del>- if (this._scriptIdMap[scriptIdentifier]) {
- console.assert(this._scriptIdMap[scriptIdentifier].url === (url || null));
- console.assert(this._scriptIdMap[scriptIdentifier].range.startLine === startLine);
- console.assert(this._scriptIdMap[scriptIdentifier].range.startColumn === startColumn);
- console.assert(this._scriptIdMap[scriptIdentifier].range.endLine === endLine);
- console.assert(this._scriptIdMap[scriptIdentifier].range.endColumn === endColumn);
</del><ins>+ if (this._scriptIdMap.has(scriptIdentifier)) {
+ var script = this._scriptIdMap.get(scriptIdentifier);
+ console.assert(script.url === (url || null));
+ console.assert(script.range.startLine === startLine);
+ console.assert(script.range.startColumn === startColumn);
+ console.assert(script.range.endLine === endLine);
+ console.assert(script.range.endColumn === endColumn);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var script = new WebInspector.Script(scriptIdentifier, new WebInspector.TextRange(startLine, startColumn, endLine, endColumn), url, isContentScript, sourceMapURL);
</span><span class="cx">
</span><del>- this._scriptIdMap[scriptIdentifier] = script;
</del><ins>+ this._scriptIdMap.set(scriptIdentifier, script);
</ins><span class="cx">
</span><span class="cx"> if (script.url) {
</span><del>- var scripts = this._scriptURLMap[script.url];
- if (!scripts)
- scripts = this._scriptURLMap[script.url] = [];
</del><ins>+ var scripts = this._scriptURLMap.get(script.url);
+ if (!scripts) {
+ scripts = [];
+ this._scriptURLMap.set(script.url, scripts);
+ }
</ins><span class="cx"> scripts.push(script);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -554,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> _sourceCodeLocationFromPayload(payload)
</span><span class="cx"> {
</span><del>- var script = this._scriptIdMap[payload.scriptId];
</del><ins>+ var script = this._scriptIdMap.get(payload.scriptId);
</ins><span class="cx"> console.assert(script);
</span><span class="cx"> if (!script)
</span><span class="cx"> return null;
</span><span class="lines">@@ -657,7 +665,7 @@
</span><span class="cx"> if (error)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._breakpointIdMap[breakpointIdentifier] = breakpoint;
</del><ins>+ this._breakpointIdMap.set(breakpointIdentifier, breakpoint);
</ins><span class="cx">
</span><span class="cx"> breakpoint.identifier = breakpointIdentifier;
</span><span class="cx">
</span><span class="lines">@@ -718,7 +726,7 @@
</span><span class="cx"> if (error)
</span><span class="cx"> console.error(error);
</span><span class="cx">
</span><del>- delete this._breakpointIdMap[breakpoint.identifier];
</del><ins>+ this._breakpointIdMap.delete(breakpoint.identifier);
</ins><span class="cx">
</span><span class="cx"> breakpoint.identifier = null;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>