<!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>[165516] 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/165516">165516</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-12 17:26:17 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Fix multiple console.assert stripping issues
https://bugs.webkit.org/show_bug.cgi?id=130166
Reviewed by Timothy Hatcher.
There were a couple console.assert stripping issues in production.
One line required a semicolon so was avoiding getting stripped.
One resulted in a logic change, when stripping the only statement
of a control flow block. Add a warning for such cases.
* Scripts/remove-console-asserts.pl:
Add warning for a console.assert being the only statement in a control flow block
without braces. When it is stripped it may change the flow of the function.
* Scripts/remove-console-asserts-dryrun.rb: Added.
Add a script to quickly test running remove console asserts on our files, to
help catch errors not in a production build and in the original non-combined
files, so you can more easily fix issues.
* UserInterface/Controllers/DOMTreeManager.js:
(WebInspector.DOMTreeManager.prototype._updateContentFlowFromPayload):
Convert the for loop into a single console.assert statement.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.removeChild):
Add missing semicolon.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptsremoveconsoleassertspl">trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptsremoveconsoleassertsdryrunrb">trunk/Source/WebInspectorUI/Scripts/remove-console-asserts-dryrun.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (165515 => 165516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-13 00:14:23 UTC (rev 165515)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-13 00:26:17 UTC (rev 165516)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-03-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Fix multiple console.assert stripping issues
+ https://bugs.webkit.org/show_bug.cgi?id=130166
+
+ Reviewed by Timothy Hatcher.
+
+ There were a couple console.assert stripping issues in production.
+ One line required a semicolon so was avoiding getting stripped.
+ One resulted in a logic change, when stripping the only statement
+ of a control flow block. Add a warning for such cases.
+
+ * Scripts/remove-console-asserts.pl:
+ Add warning for a console.assert being the only statement in a control flow block
+ without braces. When it is stripped it may change the flow of the function.
+
+ * Scripts/remove-console-asserts-dryrun.rb: Added.
+ Add a script to quickly test running remove console asserts on our files, to
+ help catch errors not in a production build and in the original non-combined
+ files, so you can more easily fix issues.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype._updateContentFlowFromPayload):
+ Convert the for loop into a single console.assert statement.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.removeChild):
+ Add missing semicolon.
+
</ins><span class="cx"> 2014-03-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: convert model tests and inspector-test.js to use Test.html
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptsremoveconsoleassertsdryrunrb"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Scripts/remove-console-asserts-dryrun.rb (0 => 165516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/remove-console-asserts-dryrun.rb (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/remove-console-asserts-dryrun.rb 2014-03-13 00:26:17 UTC (rev 165516)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+#!/usr/bin/ruby
+
+require "find"
+
+$verbose = ARGV.include?("--verbose");
+$remove_console_asserts_path = File.expand_path File.join(File.dirname(__FILE__), "remove-console-asserts.pl")
+$web_inspector_user_interface_path = File.expand_path File.join(File.dirname(__FILE__), "..", "UserInterface")
+
+Find.find($web_inspector_user_interface_path) do |path|
+ # Skip directories, External, Images, and non-js.
+ next if File.directory?(path)
+ next if path =~ /\/(External|Images)\//
+ next if path !~ /\.js$/
+
+ # Run remove-console-asserts on each file.
+ puts "Checking: #{path} ..." if $verbose
+ output = %x{ perl '#{$remove_console_asserts_path}' --input-script '#{path}' --output-script /dev/null }
+ if !output.empty?
+ puts "#{File.basename(path)}:"
+ puts output
+ puts
+ end
+end
</ins><span class="cx">Property changes on: trunk/Source/WebInspectorUI/Scripts/remove-console-asserts-dryrun.rb
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebInspectorUIScriptsremoveconsoleassertspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl (165515 => 165516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2014-03-13 00:14:23 UTC (rev 165515)
+++ trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2014-03-13 00:26:17 UTC (rev 165516)
</span><span class="lines">@@ -19,10 +19,27 @@
</span><span class="cx"> open IN, $inputScriptFilename or die;
</span><span class="cx"> our ($out, $tempFilename) = tempfile(UNLINK => 0) or die;
</span><span class="cx">
</span><ins>+our $previousLine = "";
</ins><span class="cx"> while (<IN>) {
</span><ins>+ # Warn about console.assert in control flow statement without braces. Can change logic when stripped.
+ if (/console\.assert/) {
+ if ($previousLine =~ /^\s*(for|if|else|while|do)\b/ && $previousLine !~ /\{\s*$/) {
+ print "WARNING: console.assert inside control flow statement without braces on line: $.: $_";
+ }
+ }
+
</ins><span class="cx"> s/\s*console\.assert\(.*\);\s*//g;
</span><span class="cx"> print $out $_;
</span><del>- print "WARNING: Multi-line console.assert on line $.: $_" if $_ =~ /\s*console\.assert\(/;
</del><ins>+ $previousLine = $_ if $_ !~ /^\s*$/;
+
+ # If console.assert is still on the line, either we missed a semicolon or it is multi-line. These did not get stripped.
+ if ($_ =~ /\s*console\.assert\(/) {
+ if ($_ =~ /\)\s*$/) {
+ print "WARNING: console.assert missing trailing semicolon on line $.: $_" ;
+ } else {
+ print "WARNING: Multi-line console.assert on line $.: $_" ;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> close $out;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (165515 => 165516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2014-03-13 00:14:23 UTC (rev 165515)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2014-03-13 00:26:17 UTC (rev 165516)
</span><span class="lines">@@ -552,8 +552,7 @@
</span><span class="cx"> _updateContentFlowFromPayload: function(contentFlow, flowPayload)
</span><span class="cx"> {
</span><span class="cx"> console.assert(contentFlow.contentNodes.length === flowPayload.content.length);
</span><del>- for (var i = 0; i < contentFlow.contentNodes.length; ++i)
- console.assert(contentFlow.contentNodes[i].id === flowPayload.content[i]);
</del><ins>+ console.assert(contentFlow.contentNodes.every(function(node, i) { node.id === flowPayload.content[i]; }));
</ins><span class="cx">
</span><span class="cx"> // FIXME: Collect the regions from the payload.
</span><span class="cx"> contentFlow.overset = flowPayload.overset;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (165515 => 165516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2014-03-13 00:14:23 UTC (rev 165515)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2014-03-13 00:26:17 UTC (rev 165516)
</span><span class="lines">@@ -772,7 +772,7 @@
</span><span class="cx"> if (this.children.length <= 0)
</span><span class="cx"> this.hasChildren = false;
</span><span class="cx">
</span><del>- console.assert(!child.isPlaceholderNode, "Shouldn't delete the placeholder node.")
</del><ins>+ console.assert(!child.isPlaceholderNode, "Shouldn't delete the placeholder node.");
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> removeChildren: function()
</span></span></pre>
</div>
</div>
</body>
</html>