<!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>[182142] 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/182142">182142</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-30 09:29:18 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add more ESLint rules that reflect the current state of the code base
https://bugs.webkit.org/show_bug.cgi?id=143212
Patch by Tobias Reiss <tobi+webkit@basecode.de> on 2015-03-30
Reviewed by Timothy Hatcher.
* .eslintrc:
Define some utilities as globals.
Replace "no-comma-dangle" with "comma-dangle". "no-comma-dangle" is deprecated and does not trigger in ESLint v.0.17.1
Set "new-cap" to 0 due to the usage of "WebInspector.UIString".
Disable "no-redeclare" for now and enable it back as soon as block scoped `let` is used.
Disable "dot-notation", "no-shadow" and "no-use-before-define" due to a lot of hits.
Disable "no-inner-declarations" as this is a common pattern to save memory.
* UserInterface/Views/ObjectTreePropertyTreeElement.js:
* UserInterface/Models/SourceCodeLocation.js:
It's not necessary to initialize x to undefined.
* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
* UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
* UserInterface/Views/TextEditor.js:
* UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
Remove unused variable x.
* UserInterface/Views/ObjectTreeMapEntryTreeElement.js:
* UserInterface/Models/PropertyPath.js:
* UserInterface/Views/RadioButtonNavigationItem.js:
* UserInterface/Views/ReplayDashboardView.js:
* UserInterface/Models/ScriptSyntaxTree.js:
* UserInterface/Views/SourceCodeTextEditor.js:
* UserInterface/Views/SourceCodeTreeElement.js:
Remove trailing and unexpected whitespace.
* UserInterface/Views/ProbeSetDataGrid.js:
* UserInterface/Views/TimelineRuler.js:
Add missing semicolon.
* UserInterface/Views/TimelineDataGrid.js:
* UserInterface/Views/TimelineRecordFrame.js:
Add missing var statement.
* UserInterface/Views/TypeTokenView.js:
Remove unnecessary `bind`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIeslintrc">trunk/Source/WebInspectorUI/.eslintrc</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsPropertyPathjs">trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeMapEntryTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeMapEntryTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRadioButtonNavigationItemjs">trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsReplayDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ReplayDashboardView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIeslintrc"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/.eslintrc (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/.eslintrc 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/.eslintrc 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> "DatabaseAgent": true,
</span><span class="cx"> "DebuggerAgent": true,
</span><span class="cx"> "Formatter": true,
</span><ins>+ "FormatterContentBuilder": true,
</ins><span class="cx"> "IndexedDBAgent": true,
</span><span class="cx"> "InspectorAgent": true,
</span><span class="cx"> "InspectorBackend": true,
</span><span class="lines">@@ -53,25 +54,53 @@
</span><span class="cx"> "RuntimeAgent": true,
</span><span class="cx"> "TimelineAgent": true,
</span><span class="cx"> "WebInspector": true,
</span><ins>+ "WebKitPoint": true,
</ins><span class="cx"> "WorkerAgent": true,
</span><span class="cx"> "console": true,
</span><ins>+ // utilities
+ "clamp": true,
+ "isEnterKey": true,
+ "isEmptyObject": true,
+ "insertionIndexForObjectInListSortedByFunction": true,
+ "isFunctionStringNativeCode": true,
+ "parseMIMEType": true,
+ "doubleQuotedString": true,
+ // image utilities
+ "platformImagePath": true,
+ "wrappedSVGDocument": true,
+ // url utilities
+ "absoluteURL": true,
+ "parseQueryString": true,
+ "parseURL": true,
+ "parseSecurityOrigin": true,
+ "removeURLFragment": true,
+ // externals
+ "esprima": true,
</ins><span class="cx"> },
</span><span class="cx"> "rules": {
</span><span class="cx"> "consistent-return": 2,
</span><span class="cx"> "curly": 0,
</span><ins>+ "comma-dangle": 0,
+ "dot-notation": 0,
</ins><span class="cx"> "eqeqeq": 2,
</span><ins>+ "new-cap": 0,
</ins><span class="cx"> "new-parens": 0,
</span><del>- "no-comma-dangle": 0,
</del><span class="cx"> "no-console": 0,
</span><span class="cx"> "no-constant-condition": 0,
</span><span class="cx"> "no-extra-bind": 2,
</span><span class="cx"> "no-extra-semi": 2,
</span><ins>+ "no-inner-declarations": 0,
+ "no-new": 0,
</ins><span class="cx"> "no-proto": 0,
</span><ins>+ "no-redeclare": 0,
</ins><span class="cx"> "no-return-assign": 2,
</span><ins>+ "no-shadow": 0,
</ins><span class="cx"> "no-trailing-spaces": 2,
</span><span class="cx"> "no-undef": 2,
</span><ins>+ "no-unused-vars": [2, {"vars": "all", "args": "none"}],
</ins><span class="cx"> "no-underscore-dangle": 0,
</span><span class="cx"> "no-unused-expressions": 2,
</span><ins>+ "no-use-before-define": 0,
</ins><span class="cx"> "no-wrap-func": 2,
</span><span class="cx"> "quotes": [2, "double"],
</span><span class="cx"> "semi": 2,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-03-30 Tobias Reiss <tobi+webkit@basecode.de>
+
+ Web Inspector: Add more ESLint rules that reflect the current state of the code base
+ https://bugs.webkit.org/show_bug.cgi?id=143212
+
+ Reviewed by Timothy Hatcher.
+
+ * .eslintrc:
+ Define some utilities as globals.
+ Replace "no-comma-dangle" with "comma-dangle". "no-comma-dangle" is deprecated and does not trigger in ESLint v.0.17.1
+ Set "new-cap" to 0 due to the usage of "WebInspector.UIString".
+ Disable "no-redeclare" for now and enable it back as soon as block scoped `let` is used.
+ Disable "dot-notation", "no-shadow" and "no-use-before-define" due to a lot of hits.
+ Disable "no-inner-declarations" as this is a common pattern to save memory.
+ * UserInterface/Views/ObjectTreePropertyTreeElement.js:
+ * UserInterface/Models/SourceCodeLocation.js:
+ It's not necessary to initialize x to undefined.
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ * UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
+ * UserInterface/Views/TextEditor.js:
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ Remove unused variable x.
+ * UserInterface/Views/ObjectTreeMapEntryTreeElement.js:
+ * UserInterface/Models/PropertyPath.js:
+ * UserInterface/Views/RadioButtonNavigationItem.js:
+ * UserInterface/Views/ReplayDashboardView.js:
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ * UserInterface/Views/SourceCodeTreeElement.js:
+ Remove trailing and unexpected whitespace.
+ * UserInterface/Views/ProbeSetDataGrid.js:
+ * UserInterface/Views/TimelineRuler.js:
+ Add missing semicolon.
+ * UserInterface/Views/TimelineDataGrid.js:
+ * UserInterface/Views/TimelineRecordFrame.js:
+ Add missing var statement.
+ * UserInterface/Views/TypeTokenView.js:
+ Remove unnecessary `bind`.
+
</ins><span class="cx"> 2015-03-28 Saam Barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ES6: Better support for Symbol types in Type Profiler
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsPropertyPathjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/PropertyPath.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> var components = [];
</span><span class="cx"> for (var p = this; p && p.pathComponent; p = p.parent)
</span><span class="cx"> components.push(p.pathComponent);
</span><del>- components.reverse()
</del><ins>+ components.reverse();
</ins><span class="cx"> return components.join("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> components.reverse();
</span><del>- return components.join("");
</del><ins>+ return components.join("");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> displayPath(type)
</span><span class="lines">@@ -214,13 +214,13 @@
</span><span class="cx"> if (keyObject && keyObject.hasValue()) {
</span><span class="cx"> if (keyObject.type === "string") {
</span><span class="cx"> var component = ".get(" + doubleQuotedString(keyObject.description) + ")";
</span><del>- return new WebInspector.PropertyPath(object, component, this);
</del><ins>+ return new WebInspector.PropertyPath(object, component, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var component = ".get(" + keyObject.description + ")";
</span><del>- return new WebInspector.PropertyPath(object, component, this);
</del><ins>+ return new WebInspector.PropertyPath(object, component, this);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.MapValue;
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> var component = WebInspector.PropertyPath.SpecialPathComponent.SetIndex;
</span><span class="cx"> return new WebInspector.PropertyPath(object, component, this);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> appendPropertyDescriptor(object, descriptor, type)
</span><span class="cx"> {
</span><span class="cx"> if (descriptor.isInternalProperty)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> if (this._object.subtype === "array" && !isNaN(parseInt(descriptor.name)))
</span><span class="cx"> return this.appendArrayIndex(object, descriptor.name);
</span><span class="cx">
</span><del>- return this.appendPropertyName(object, descriptor.name)
</del><ins>+ return this.appendPropertyName(object, descriptor.name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><del>-
</del><ins>+
</ins><span class="cx"> get parsedSuccessfully()
</span><span class="cx"> {
</span><span class="cx"> return this._parsedSuccessfully;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> this._recurse(this._syntaxTree, callback, this._defaultParserState());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- filter(predicate, startNode)
</del><ins>+ filter(predicate, startNode)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(startNode && this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> if (predicate(node))
</span><span class="cx"> nodes.push(node);
</span><span class="cx"> else
</span><del>- state.skipChildNodes = true;
</del><ins>+ state.skipChildNodes = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._recurse(startNode, filter, this._defaultParserState());
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> console.assert(this._parsedSuccessfully);
</span><span class="cx"> if (!this._parsedSuccessfully)
</span><span class="cx"> return [];
</span><del>-
</del><ins>+
</ins><span class="cx"> var allNodes = [];
</span><span class="cx"> var start = 0;
</span><span class="cx"> var end = 1;
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> function removeFunctionsFilter(node)
</span><span class="cx"> {
</span><del>- return node.type !== WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression
</del><ins>+ return node.type !== WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression
</ins><span class="cx"> && node.type !== WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> startNode.attachments._hasNonEmptyReturnStatement = hasNonEmptyReturnStatement;
</span><span class="cx">
</span><span class="cx"> return hasNonEmptyReturnStatement;
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> _gatherIdentifiersInDeclaration(node)
</span><span class="cx"> {
</span><del>- function gatherIdentifiers(node)
</del><ins>+ function gatherIdentifiers(node)
</ins><span class="cx"> {
</span><span class="cx"> switch (node.type) {
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.Identifier:
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> return gatherIdentifiers(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _defaultParserState()
</del><ins>+ _defaultParserState()
</ins><span class="cx"> {
</span><span class="cx"> return {
</span><span class="cx"> shouldStopEarly: false,
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _recurse(node, callback, state)
</del><ins>+ _recurse(node, callback, state)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -487,17 +487,17 @@
</span><span class="cx"> state.skipChildNodes = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _recurseArray(array, callback, state)
</del><ins>+ _recurseArray(array, callback, state)
</ins><span class="cx"> {
</span><span class="cx"> for (var node of array)
</span><span class="cx"> this._recurse(node, callback, state);
</span><span class="cx"> }
</span><del>-
- // This function translates from esprima's Abstract Syntax Tree to ours.
</del><ins>+
+ // This function translates from esprima's Abstract Syntax Tree to ours.
</ins><span class="cx"> // Mostly, this is just the identity function. We've added an extra isGetterOrSetter property for functions.
</span><span class="cx"> // Our AST complies with the Mozilla parser API:
</span><span class="cx"> // https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Parser_API
</span><del>- _createInternalSyntaxTree(node)
</del><ins>+ _createInternalSyntaxTree(node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return null;
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> superClass: this._createInternalSyntaxTree(node.superClass),
</span><span class="cx"> body: this._createInternalSyntaxTree(node.body),
</span><span class="cx"> };
</span><del>- break;
</del><ins>+ break;
</ins><span class="cx"> case "ConditionalExpression":
</span><span class="cx"> result = {
</span><span class="cx"> type: WebInspector.ScriptSyntaxTree.NodeType.ConditionalExpression,
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> console.error("Unsupported Syntax Tree Node: " + node.type, node);
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> result.range = node.range;
</span><span class="cx"> // This is an object for which you can add fields to an AST node without worrying about polluting the syntax-related fields of the node.
</span><span class="cx"> result.attachments = {};
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> populateLiveDisplayLocationString(element, propertyName, columnStyle, nameStyle, prefix)
</span><span class="cx"> {
</span><del>- var currentDisplay = undefined;
</del><ins>+ var currentDisplay;
</ins><span class="cx">
</span><span class="cx"> function updateDisplayString(showAlternativeLocation, forceUpdate)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -310,8 +310,6 @@
</span><span class="cx"> {
</span><span class="cx"> this._clearTextMarkers(true);
</span><span class="cx">
</span><del>- var styleText = this._style.text;
-
</del><span class="cx"> this._iterateOverProperties(true, function(property) {
</span><span class="cx"> var styleTextRange = property.styleDeclarationTextRange;
</span><span class="cx"> console.assert(styleTextRange);
</span><span class="lines">@@ -395,7 +393,6 @@
</span><span class="cx"> swatchElement.appendChild(swatchInnerElement);
</span><span class="cx">
</span><span class="cx"> var codeMirrorTextMarker = marker.codeMirrorTextMarker;
</span><del>- var swatchMarker = this._codeMirror.setUniqueBookmark(codeMirrorTextMarker.find().from, swatchElement);
</del><span class="cx">
</span><span class="cx"> swatchInnerElement.__colorTextMarker = codeMirrorTextMarker;
</span><span class="cx"> swatchInnerElement.__color = color;
</span><span class="lines">@@ -1010,4 +1007,4 @@
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.CheckboxPlaceholderElementStyleClassName = "checkbox-placeholder";
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.EditingLineStyleClassName = "editing-line";
</span><span class="cx"> WebInspector.CSSStyleDeclarationTextEditor.CommitCoalesceDelay = 250;
</span><del>-WebInspector.CSSStyleDeclarationTextEditor.RemoveEditingLineClassesDelay = 2000;
</del><span class="cx">\ No newline at end of file
</span><ins>+WebInspector.CSSStyleDeclarationTextEditor.RemoveEditingLineClassesDelay = 2000;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -245,8 +245,6 @@
</span><span class="cx">
</span><span class="cx"> _updateLayerInfoSection(layer)
</span><span class="cx"> {
</span><del>- var emDash = "\u2014";
-
</del><span class="cx"> this._layerInfoSection.groups = layer ? [this._layerInfoGroup] : [this._noLayerInformationGroup];
</span><span class="cx">
</span><span class="cx"> if (!layer)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeMapEntryTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeMapEntryTreeElement.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeMapEntryTreeElement.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeMapEntryTreeElement.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> this.addClassName("key");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> displayPropertyName()
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> this.addClassName("value");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> displayPropertyName()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> this._updateTooltips();
</span><span class="cx"> this._updateHasChildren();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> onpopulate()
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> var isPropertyMode = mode === WebInspector.ObjectTreeView.Mode.Properties || this._getterValue;
</span><span class="cx"> var isAPI = mode !== WebInspector.ObjectTreeView.Mode.Prototype;
</span><span class="cx">
</span><del>- var prototypeName = undefined;
</del><ins>+ var prototypeName;
</ins><span class="cx"> if (this.property.name === "__proto__") {
</span><span class="cx"> if (resolvedValue.description)
</span><span class="cx"> prototypeName = this._sanitizedPrototypeString(resolvedValue);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> this._listeners.register(probeSet, WebInspector.ProbeSet.Event.ProbeAdded, this._setupProbe);
</span><span class="cx"> this._listeners.register(probeSet, WebInspector.ProbeSet.Event.ProbeRemoved, this._teardownProbe);
</span><span class="cx"> this._listeners.register(probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._setupData);
</span><del>- this._listeners.register(WebInspector.Probe, WebInspector.Probe.Event.ExpressionChanged, this._probeExpressionChanged)
</del><ins>+ this._listeners.register(WebInspector.Probe, WebInspector.Probe.Event.ExpressionChanged, this._probeExpressionChanged);
</ins><span class="cx"> this._listeners.install();
</span><span class="cx">
</span><span class="cx"> this._setupData();
</span><del>-}
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> WebInspector.ProbeSetDataGrid.DataUpdatedStyleClassName = "data-updated";
</span><span class="cx"> WebInspector.ProbeSetDataGrid.PastFrameStyleClassName = "past-value";
</span><span class="lines">@@ -192,4 +192,4 @@
</span><span class="cx"> for (var frame of this._data.frames)
</span><span class="cx"> this._updateNodeForFrame(frame);
</span><span class="cx"> }
</span><del>-}
</del><ins>+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRadioButtonNavigationItemjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> var classNames = this._classNames.join(".");
</span><span class="cx">
</span><span class="cx"> // Default state.
</span><del>- var styleText = parentSelector + " ." + classNames + " > .glyph { background-image: -webkit-canvas(" + this._canvasIdentifier() + "); background-size: " + this._imageWidth + "px " + this._imageHeight + "px; }\n";
</del><ins>+ var styleText = parentSelector + " ." + classNames + " > .glyph { background-image: -webkit-canvas(" + this._canvasIdentifier() + "); background-size: " + this._imageWidth + "px " + this._imageHeight + "px; }\n";
</ins><span class="cx">
</span><span class="cx"> // Selected state.
</span><span class="cx"> styleText += parentSelector + " ." + classNames + ".selected:not(.disabled) > .glyph { background-image: -webkit-canvas(" + this._canvasIdentifier(WebInspector.ButtonNavigationItem.States.Focus) + "); }\n";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsReplayDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ReplayDashboardView.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ReplayDashboardView.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ReplayDashboardView.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> else
</span><span class="cx"> this._playbackPaused();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _captureButtonItemClicked()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> var title = null;
</span><span class="cx"> var extraPropertyDescriptor = null;
</span><span class="cx"> var collapsedByDefault = false;
</span><del>- var dontHighlightNonEnumerableProperties = true;
</del><span class="cx">
</span><span class="cx"> ++sectionCountByType[scope.type];
</span><span class="cx">
</span><span class="lines">@@ -101,7 +100,6 @@
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.Local:
</span><span class="cx"> foundLocalScope = true;
</span><span class="cx"> collapsedByDefault = false;
</span><del>- dontHighlightNonEnumerableProperties = true;
</del><span class="cx">
</span><span class="cx"> title = WebInspector.UIString("Local Variables");
</span><span class="cx">
</span><span class="lines">@@ -111,31 +109,26 @@
</span><span class="cx">
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.Closure:
</span><span class="cx"> title = WebInspector.UIString("Closure Variables");
</span><del>- dontHighlightNonEnumerableProperties = true;
</del><span class="cx"> collapsedByDefault = false;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.Catch:
</span><span class="cx"> title = WebInspector.UIString("Catch Variables");
</span><del>- dontHighlightNonEnumerableProperties = true;
</del><span class="cx"> collapsedByDefault = false;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.FunctionName:
</span><span class="cx"> title = WebInspector.UIString("Function Name Variable");
</span><del>- dontHighlightNonEnumerableProperties = true;
</del><span class="cx"> collapsedByDefault = true;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.With:
</span><span class="cx"> title = WebInspector.UIString("With Object Properties");
</span><span class="cx"> collapsedByDefault = foundLocalScope;
</span><del>- dontHighlightNonEnumerableProperties = false;
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.ScopeChainNode.Type.Global:
</span><span class="cx"> title = WebInspector.UIString("Global Variables");
</span><del>- dontHighlightNonEnumerableProperties = false;
</del><span class="cx"> collapsedByDefault = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> this.tokenTrackingController.removeHighlightedRange();
</span><span class="cx">
</span><span class="cx"> this._dismissPopover();
</span><del>-
</del><ins>+
</ins><span class="cx"> this._dismissEditingController(true);
</span><span class="cx">
</span><span class="cx"> if (this._typeTokenAnnotator)
</span><span class="lines">@@ -298,8 +298,8 @@
</span><span class="cx">
</span><span class="cx"> prettyPrint(pretty)
</span><span class="cx"> {
</span><del>- // The annotators must be cleared before pretty printing takes place and resumed
- // after so that they clear their annotations in a known state and insert new annotations
</del><ins>+ // The annotators must be cleared before pretty printing takes place and resumed
+ // after so that they clear their annotations in a known state and insert new annotations
</ins><span class="cx"> // in the new state.
</span><span class="cx"> var shouldResumeTypeTokenAnnotator = this._typeTokenAnnotator && this._typeTokenAnnotator.isActive();
</span><span class="cx"> var shouldResumeBasicBlockAnnotator = this._basicBlockAnnotator && this._basicBlockAnnotator.isActive();
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> arrowElement.className = "arrow";
</span><span class="cx">
</span><span class="cx"> var iconElement = widgetElement.appendChild(document.createElement("span"));
</span><del>- iconElement.className = "icon";
</del><ins>+ iconElement.className = "icon";
</ins><span class="cx">
</span><span class="cx"> var textElement = widgetElement.appendChild(document.createElement("span"));
</span><span class="cx"> textElement.className = "text";
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> var textElement = widget.widgetElement.lastChild;
</span><span class="cx"> if (textElement.offsetWidth !== textElement.scrollWidth)
</span><span class="cx"> return true;
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1551,7 +1551,7 @@
</span><span class="cx">
</span><span class="cx"> _trackPopoverEvents()
</span><span class="cx"> {
</span><del>- if (!this._popoverEventListeners)
</del><ins>+ if (!this._popoverEventListeners)
</ins><span class="cx"> this._popoverEventListeners = new WebInspector.EventListenerSet(this, "Popover listeners");
</span><span class="cx"> if (!this._popoverEventListenersAreRegistered) {
</span><span class="cx"> this._popoverEventListenersAreRegistered = true;
</span><span class="lines">@@ -1622,13 +1622,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._editingController)
</span><span class="cx"> this._editingController.dismissHoverMenu(discrete);
</span><del>-
</del><ins>+
</ins><span class="cx"> this.tokenTrackingController.hoveredMarker = null;
</span><span class="cx"> delete this._editingController;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // CodeMirrorEditingController Delegate
</span><del>-
</del><ins>+
</ins><span class="cx"> editingControllerDidStartEditing(editingController)
</span><span class="cx"> {
</span><span class="cx"> // We can pause the token tracking controller during editing, it will be reset
</span><span class="lines">@@ -1638,11 +1638,11 @@
</span><span class="cx">
</span><span class="cx"> // We clear the marker since we'll reset it after editing.
</span><span class="cx"> editingController.marker.clear();
</span><del>-
</del><ins>+
</ins><span class="cx"> // We ignore content changes made as a result of color editing.
</span><span class="cx"> this._ignoreContentDidChange++;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> editingControllerDidFinishEditing(editingController)
</span><span class="cx"> {
</span><span class="cx"> this._updateEditableMarkers(editingController.range);
</span><span class="lines">@@ -1670,10 +1670,10 @@
</span><span class="cx"> if (!this._typeTokenScrollHandler)
</span><span class="cx"> this._enableScrollEventsForTypeTokenAnnotator();
</span><span class="cx"> } else {
</span><del>- // Because we disable type profiling when exiting the inspector, there is no need to call
- // RuntimeAgent.disableTypeProfiler() here. If we were to call it here, JavaScriptCore would
- // compile out all the necessary type profiling information, so if a user were to quickly press then
- // unpress the type profiling button, we wouldn't be able to re-show type information which would
</del><ins>+ // Because we disable type profiling when exiting the inspector, there is no need to call
+ // RuntimeAgent.disableTypeProfiler() here. If we were to call it here, JavaScriptCore would
+ // compile out all the necessary type profiling information, so if a user were to quickly press then
+ // unpress the type profiling button, we wouldn't be able to re-show type information which would
</ins><span class="cx"> // provide a confusing user experience.
</span><span class="cx">
</span><span class="cx"> this._typeTokenAnnotator.clear();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTreeElement.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> var currentPath = "";
</span><span class="cx"> var currentFolderTreeElement = this;
</span><span class="cx">
</span><del>- for (var i = 0 ; i < components.length - 1; ++i) {
</del><ins>+ for (var i = 0; i < components.length - 1; ++i) {
</ins><span class="cx"> var componentName = components[i];
</span><span class="cx"> currentPath += (i ? "/" : "") + componentName;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><del>- var text = (element ? element.textContent : "");
</del><span class="cx"> this._element = element || document.createElement("div");
</span><span class="cx"> this._element.classList.add("text-editor");
</span><span class="cx"> this._element.classList.add(WebInspector.SyntaxHighlightedStyleClassName);
</span><span class="lines">@@ -757,8 +756,8 @@
</span><span class="cx">
</span><span class="cx"> var mappedAnchorLocation = this._formatterSourceMap.originalToFormatted(oldSelectionAnchor.line, oldSelectionAnchor.ch);
</span><span class="cx"> var mappedHeadLocation = this._formatterSourceMap.originalToFormatted(oldSelectionHead.line, oldSelectionHead.ch);
</span><del>- newSelectionAnchor = {line:mappedAnchorLocation.lineNumber, ch:mappedAnchorLocation.columnNumber};
- newSelectionHead = {line:mappedHeadLocation.lineNumber, ch:mappedHeadLocation.columnNumber};
</del><ins>+ newSelectionAnchor = {line: mappedAnchorLocation.lineNumber, ch: mappedAnchorLocation.columnNumber};
+ newSelectionHead = {line: mappedHeadLocation.lineNumber, ch: mappedHeadLocation.columnNumber};
</ins><span class="cx"> } else {
</span><span class="cx"> this._codeMirror.undo();
</span><span class="cx">
</span><span class="lines">@@ -780,8 +779,8 @@
</span><span class="cx">
</span><span class="cx"> var mappedAnchorLocation = this._formatterSourceMap.formattedToOriginal(oldSelectionAnchor.line, oldSelectionAnchor.ch);
</span><span class="cx"> var mappedHeadLocation = this._formatterSourceMap.formattedToOriginal(oldSelectionHead.line, oldSelectionHead.ch);
</span><del>- newSelectionAnchor = {line:mappedAnchorLocation.lineNumber, ch:mappedAnchorLocation.columnNumber};
- newSelectionHead = {line:mappedHeadLocation.lineNumber, ch:mappedHeadLocation.columnNumber};
</del><ins>+ newSelectionAnchor = {line: mappedAnchorLocation.lineNumber, ch: mappedAnchorLocation.columnNumber};
+ newSelectionHead = {line: mappedHeadLocation.lineNumber, ch: mappedHeadLocation.columnNumber};
</ins><span class="cx">
</span><span class="cx"> this._formatterSourceMap = null;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> this.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sort, this);
</span><span class="cx">
</span><span class="cx"> window.addEventListener("resize", this._windowResized.bind(this));
</span><del>-}
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> WebInspector.TimelineDataGrid.StyleClassName = "timeline";
</span><span class="cx"> WebInspector.TimelineDataGrid.HasNonDefaultFilterStyleClassName = "has-non-default-filter";
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> this._treeOutlineDataGridSynchronizer.associate(treeElement, dataGridNode);
</span><span class="cx">
</span><span class="cx"> parentElement = parentElement || this._treeOutlineDataGridSynchronizer.treeOutline;
</span><del>- parentNode = parentElement.root ? this : this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(parentElement);
</del><ins>+ var parentNode = parentElement.root ? this : this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(parentElement);
</ins><span class="cx">
</span><span class="cx"> console.assert(parentNode);
</span><span class="cx">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> this._popoverCallStackTreeOutline.removeChildren();
</span><span class="cx">
</span><span class="cx"> var callFrames = this.selectedNode.record.callFrames;
</span><del>- for (var i = 0 ; i < callFrames.length; ++i) {
</del><ins>+ for (var i = 0; i < callFrames.length; ++i) {
</ins><span class="cx"> var callFrameTreeElement = new WebInspector.CallFrameTreeElement(callFrames[i]);
</span><span class="cx"> this._popoverCallStackTreeOutline.appendChild(callFrameTreeElement);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (type in WebInspector.TimelineRecord.Type) {
</del><ins>+ for (var type in WebInspector.TimelineRecord.Type) {
</ins><span class="cx"> var recordType = WebInspector.TimelineRecord.Type[type];
</span><span class="cx"> var duration = displayRecord.durationForRecords(recordType);
</span><span class="cx"> if (duration === 0)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> count: dividerCount,
</span><span class="cx"> firstTime: firstDividerTime,
</span><span class="cx"> lastTime: lastDividerTime,
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> if (Object.shallowEqual(dividerData, this._currentDividers))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTypeTokenViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js (182141 => 182142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2015-03-30 16:15:00 UTC (rev 182141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js 2015-03-30 16:29:18 UTC (rev 182142)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> {
</span><span class="cx"> constructor(tokenAnnotator, shouldHaveRightMargin, shouldHaveLeftMargin, titleType, functionOrVariableName)
</span><span class="cx"> {
</span><del>- console.assert(titleType === WebInspector.TypeTokenView.TitleType.Variable || titleType === WebInspector.TypeTokenView.TitleType.ReturnStatement);
</del><ins>+ console.assert(titleType === WebInspector.TypeTokenView.TitleType.Variable || titleType === WebInspector.TypeTokenView.TitleType.ReturnStatement);
</ins><span class="cx">
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> this.element.addEventListener("mouseout", function() {
</span><span class="cx"> if (timeoutID)
</span><span class="cx"> clearTimeout(timeoutID);
</span><del>- }.bind(this));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _shouldShowPopover()
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> return this._types.leastCommonAncestor + "?";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // The order of these checks are important.
</del><ins>+ // The order of these checks are important.
</ins><span class="cx"> // For example, if a value is only a function, it is contained in TypeFunction, but it is also contained in (TypeFunction | TypeNull).
</span><span class="cx"> // Therefore, more specific types must be checked first.
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return "String?";
</span><span class="cx"> if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Symbol | WebInspector.TypeSet.NullOrUndefinedTypeBits))
</span><span class="cx"> return "Symbol?";
</span><del>-
</del><ins>+
</ins><span class="cx"> if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object | WebInspector.TypeSet.TypeBit.Function | WebInspector.TypeSet.TypeBit.String))
</span><span class="cx"> return "Object";
</span><span class="cx"> if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object | WebInspector.TypeSet.TypeBit.Function | WebInspector.TypeSet.TypeBit.String | WebInspector.TypeSet.NullOrUndefinedTypeBits))
</span></span></pre>
</div>
</div>
</body>
</html>