<!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>[193124] 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/193124">193124</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:49:02 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188601">r188601</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.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 (193123 => 193124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:48:58 UTC (rev 193123)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:02 UTC (rev 193124)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188601. rdar://problem/23221163
+
+ 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Modernize CSSStyleManager
+ https://bugs.webkit.org/show_bug.cgi?id=148143
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Controllers/CSSStyleManager.js:
+ - Eliminate `delete` operator use.
+ - Move from using Objects as hashmaps to Map.
+ - Fix typos.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188586. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (193123 => 193124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-03 18:48:58 UTC (rev 193123)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-03 18:49:02 UTC (rev 193124)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx">
</span><span class="cx"> this._colorFormatSetting = new WebInspector.Setting("default-color-format", WebInspector.Color.Format.Original);
</span><span class="cx">
</span><del>- this._styleSheetIdentifierMap = {};
- this._styleSheetFrameURLMap = {};
</del><ins>+ this._styleSheetIdentifierMap = new Map;
+ this._styleSheetFrameURLMap = new Map;
</ins><span class="cx"> this._nodeStylesMap = {};
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,11 +95,12 @@
</span><span class="cx">
</span><span class="cx"> styleSheetForIdentifier(id)
</span><span class="cx"> {
</span><del>- if (id in this._styleSheetIdentifierMap)
- return this._styleSheetIdentifierMap[id];
</del><ins>+ var styleSheet = this._styleSheetIdentifierMap.get(id);
+ if (styleSheet)
+ return styleSheet;
</ins><span class="cx">
</span><del>- var styleSheet = new WebInspector.CSSStyleSheet(id);
- this._styleSheetIdentifierMap[id] = styleSheet;
</del><ins>+ styleSheet = new WebInspector.CSSStyleSheet(id);
+ this._styleSheetIdentifierMap.set(id, styleSheet);
</ins><span class="cx"> return styleSheet;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -172,8 +173,8 @@
</span><span class="cx">
</span><span class="cx"> // Clear our maps when the main frame navigates.
</span><span class="cx">
</span><del>- this._styleSheetIdentifierMap = {};
- this._styleSheetFrameURLMap = {};
</del><ins>+ this._styleSheetIdentifierMap.clear();
+ this._styleSheetFrameURLMap.clear();
</ins><span class="cx"> this._nodeStylesMap = {};
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -206,8 +207,8 @@
</span><span class="cx"> // Clear known stylesheets for this URL and frame. This will cause the stylesheets to
</span><span class="cx"> // be updated next time _fetchInfoForAllStyleSheets is called.
</span><span class="cx"> // COMPATIBILITY (iOS 6): The frame's id was not available for the key, so delete just the url too.
</span><del>- delete this._styleSheetFrameURLMap[this._frameURLMapKey(resource.parentFrame, resource.url)];
- delete this._styleSheetFrameURLMap[resource.url];
</del><ins>+ this._styleSheetIdentifierMap.delete(this._frameURLMapKey(resource.parentFrame, resource.url));
+ this._styleSheetIdentifierMap.delete(resource.url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _frameURLMapKey(frame, url)
</span><span class="lines">@@ -224,18 +225,19 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(frame instanceof WebInspector.Frame);
</span><span class="cx">
</span><del>- function syleSheetsFetched()
</del><ins>+ var key = this._frameURLMapKey(frame, url);
+
+ function styleSheetsFetched()
</ins><span class="cx"> {
</span><del>- callback(this._styleSheetFrameURLMap[key] || this._styleSheetFrameURLMap[url] || null);
</del><ins>+ callback(this._styleSheetFrameURLMap.get(key) || this._styleSheetFrameURLMap.get(url) || null);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var key = this._frameURLMapKey(frame, url);
-
</del><span class="cx"> // COMPATIBILITY (iOS 6): The frame's id was not available for the key, so check for just the url too.
</span><del>- if (key in this._styleSheetFrameURLMap || url in this._styleSheetFrameURLMap)
- callback(this._styleSheetFrameURLMap[key] || this._styleSheetFrameURLMap[url] || null);
</del><ins>+ var styleSheet = this._styleSheetFrameURLMap.get(key) || this._styleSheetFrameURLMap.get(url) || null;
+ if (styleSheet)
+ callback(styleSheet);
</ins><span class="cx"> else
</span><del>- this._fetchInfoForAllStyleSheets(syleSheetsFetched.bind(this));
</del><ins>+ this._fetchInfoForAllStyleSheets(styleSheetsFetched.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _fetchInfoForAllStyleSheets(callback)
</span><span class="lines">@@ -244,7 +246,7 @@
</span><span class="cx">
</span><span class="cx"> function processStyleSheets(error, styleSheets)
</span><span class="cx"> {
</span><del>- this._styleSheetFrameURLMap = {};
</del><ins>+ this._styleSheetFrameURLMap.clear();
</ins><span class="cx">
</span><span class="cx"> if (error) {
</span><span class="cx"> callback();
</span><span class="lines">@@ -259,7 +261,7 @@
</span><span class="cx"> styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame);
</span><span class="cx">
</span><span class="cx"> var key = this._frameURLMapKey(parentFrame, styleSheetInfo.sourceURL);
</span><del>- this._styleSheetFrameURLMap[key] = styleSheet;
</del><ins>+ this._styleSheetFrameURLMap.set(key, styleSheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callback();
</span><span class="lines">@@ -282,7 +284,7 @@
</span><span class="cx"> {
</span><span class="cx"> function styleSheetFound(styleSheet)
</span><span class="cx"> {
</span><del>- delete resource.__pendingChangeTimeout;
</del><ins>+ resource.__pendingChangeTimeout = undefined;
</ins><span class="cx">
</span><span class="cx"> console.assert(styleSheet);
</span><span class="cx"> if (!styleSheet)
</span><span class="lines">@@ -312,7 +314,7 @@
</span><span class="cx"> var styleSheet = parameters.sourceCode;
</span><span class="cx"> var content = parameters.content;
</span><span class="cx">
</span><del>- delete styleSheet.__pendingChangeTimeout;
</del><ins>+ styleSheet.__pendingChangeTimeout = undefined;
</ins><span class="cx">
</span><span class="cx"> console.assert(styleSheet.url);
</span><span class="cx"> if (!styleSheet.url)
</span><span class="lines">@@ -336,13 +338,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (resource.__ignoreNextUpdateResourceContent) {
</span><del>- delete resource.__ignoreNextUpdateResourceContent;
</del><ins>+ resource.__ignoreNextUpdateResourceContent = false;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._ignoreResourceContentDidChangeEventForResource = resource;
</span><span class="cx"> WebInspector.branchManager.currentBranch.revisionForRepresentedObject(resource).content = content;
</span><del>- delete this._ignoreResourceContentDidChangeEventForResource;
</del><ins>+ this._ignoreResourceContentDidChangeEventForResource = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function styleSheetReady()
</span></span></pre>
</div>
</div>
</body>
</html>