<!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>[198968] 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/198968">198968</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-01 22:23:32 -0700 (Fri, 01 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove console.asserts from Worker code in optimized builds
https://bugs.webkit.org/show_bug.cgi?id=156124
<rdar://problem/25505031>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-01
Reviewed by Timothy Hatcher.
* Scripts/copy-user-interface-resources.pl:
Remove console asserts on the Worker results directory.
* Scripts/remove-console-asserts.pl:
(removeConsoleAssertsInFile):
(removeConsoleAssertsInDirectory):
Refactor into functions for a file and a file for
recursing through directories.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptsremoveconsoleassertspl">trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198967 => 198968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-02 03:21:38 UTC (rev 198967)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-02 05:23:32 UTC (rev 198968)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove console.asserts from Worker code in optimized builds
+ https://bugs.webkit.org/show_bug.cgi?id=156124
+ <rdar://problem/25505031>
+
+ Reviewed by Timothy Hatcher.
+
+ * Scripts/copy-user-interface-resources.pl:
+ Remove console asserts on the Worker results directory.
+
+ * Scripts/remove-console-asserts.pl:
+ (removeConsoleAssertsInFile):
+ (removeConsoleAssertsInDirectory):
+ Refactor into functions for a file and a file for
+ recursing through directories.
+
</ins><span class="cx"> 2016-03-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ScriptSyntaxTree doesn't handle RestElement AST nodes
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (198967 => 198968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-04-02 03:21:38 UTC (rev 198967)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2016-04-02 05:23:32 UTC (rev 198968)
</span><span class="lines">@@ -242,6 +242,9 @@
</span><span class="cx"> # Copy the Protocol/Legacy and Workers directories.
</span><span class="cx"> ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
</span><span class="cx"> ditto(File::Spec->catfile($uiRoot, 'Workers'), $workersDir);
</span><ins>+
+ # Remove console.assert calls from the Worker js files.
+ system(File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-directory', $workersDir);
</ins><span class="cx"> } else {
</span><span class="cx"> # Keep the files separate for engineering builds.
</span><span class="cx"> ditto($uiRoot, $targetResourcePath);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptsremoveconsoleassertspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl (198967 => 198968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2016-04-02 03:21:38 UTC (rev 198967)
+++ trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl 2016-04-02 05:23:32 UTC (rev 198968)
</span><span class="lines">@@ -4,45 +4,87 @@
</span><span class="cx"> use Getopt::Long;
</span><span class="cx"> use File::Copy qw/move/;
</span><span class="cx"> use File::Temp qw/tempfile/;
</span><ins>+use File::Spec;
</ins><span class="cx">
</span><ins>+sub removeConsoleAssertsInFile($$);
+sub removeConsoleAssertsInDirectory($);
+
+our $inputDirectory;
</ins><span class="cx"> our $inputScriptFilename;
</span><span class="cx"> our $outputScriptFilename;
</span><span class="cx">
</span><del>-GetOptions('input-script=s' => \$inputScriptFilename,
</del><ins>+GetOptions('input-directory=s' => \$inputDirectory,
+ 'input-script=s' => \$inputScriptFilename,
</ins><span class="cx"> 'output-script=s' => \$outputScriptFilename);
</span><span class="cx">
</span><del>-unless (defined $inputScriptFilename and defined $outputScriptFilename) {
- print "Usage: $0 --input-script <path> --output-script <path>\n";
</del><ins>+if (defined $inputScriptFilename and defined $outputScriptFilename) {
+ removeConsoleAssertsInFile($inputScriptFilename, $outputScriptFilename);
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-open IN, $inputScriptFilename or die "Couldn't open $inputScriptFilename: $!";
-our ($out, $tempFilename) = tempfile(UNLINK => 0) or die;
</del><ins>+if (defined $inputDirectory) {
+ removeConsoleAssertsInDirectory($inputDirectory);
+ exit;
+}
</ins><span class="cx">
</span><del>-our $previousLine = "";
-while (<IN>) {
- # 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: $.: $_";
</del><ins>+print "Usage: $0 --input-script <path> --output-script <path>\n";
+print "Usage: $0 --input-directory <path>\n";
+exit;
+
+sub removeConsoleAssertsInFile($$)
+{
+ my $inputScriptFilename = shift;
+ my $outputScriptFilename = shift;
+
+ print "STRIPPING: $inputScriptFilename\n";
+
+ open IN, $inputScriptFilename or die "Couldn't open $inputScriptFilename: $!";
+ my ($out, $tempFilename) = tempfile(UNLINK => 0) or die;
+
+ my $previousLine = "";
+ while (<IN>) {
+ # 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"> }
</span><del>- }
</del><span class="cx">
</span><del>- s/\s*console\.assert\(.*\);\s*//g;
- print $out $_;
- $previousLine = $_ if $_ !~ /^\s*$/;
</del><ins>+ s/\s*console\.assert\(.*\);\s*//g;
+ print $out $_;
+ $previousLine = $_ if $_ !~ /^\s*$/;
</ins><span class="cx">
</span><del>- # 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 $.: $_" ;
</del><ins>+ # 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><ins>+
+ close $out;
+ close IN;
+
+ move $tempFilename, $outputScriptFilename or die "$!";
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-close $out;
-close IN;
</del><ins>+sub removeConsoleAssertsInDirectory($)
+{
+ my $inputDirectory = shift;
</ins><span class="cx">
</span><del>-move $tempFilename, $outputScriptFilename or die "$!";
</del><ins>+ opendir(DIR, $inputDirectory) || die "$!";
+ my @files = grep { !/^\.{1,2}$/ } readdir (DIR);
+ closedir(DIR);
+
+ foreach my $file (@files) {
+ next if $file eq '.' or $file eq '..';
+ my $path = File::Spec->catdir($inputDirectory, $file);
+ if (-d $path) {
+ removeConsoleAssertsInDirectory($path);
+ } elsif ($file =~ /\.js$/) {
+ removeConsoleAssertsInFile($path, $path);
+ }
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>