<!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>[192902] 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/192902">192902</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-01 13:11:44 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Broken Inspector when resources are minified
https://bugs.webkit.org/show_bug.cgi?id=151711
Reviewed by Timothy Hatcher.
* Scripts/combine-resources.pl:
(concatenateFiles):
Provide a way to just strip resources matches a pattern.
* Scripts/copy-user-interface-resources.pl:
Strip "Debug/" resources before combining / minifying others.
* UserInterface/Views/View.js:
(WebInspector.View.prototype.makeRootView):
(WebInspector.View.prototype.didDetach):
Address warnings from the console.assert stripping phase
for console.assert statements lacking a trailing semicolon.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscombineresourcespl">trunk/Source/WebInspectorUI/Scripts/combine-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/View.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (192901 => 192902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-12-01 20:53:04 UTC (rev 192901)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-12-01 21:11:44 UTC (rev 192902)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Broken Inspector when resources are minified
+ https://bugs.webkit.org/show_bug.cgi?id=151711
+
+ Reviewed by Timothy Hatcher.
+
+ * Scripts/combine-resources.pl:
+ (concatenateFiles):
+ Provide a way to just strip resources matches a pattern.
+
+ * Scripts/copy-user-interface-resources.pl:
+ Strip "Debug/" resources before combining / minifying others.
+
+ * UserInterface/Views/View.js:
+ (WebInspector.View.prototype.makeRootView):
+ (WebInspector.View.prototype.didDetach):
+ Address warnings from the console.assert stripping phase
+ for console.assert statements lacking a trailing semicolon.
+
</ins><span class="cx"> 2015-11-30 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: show something useful when the inspector frontend fails to load
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscombineresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/combine-resources.pl (192901 => 192902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/combine-resources.pl        2015-12-01 20:53:04 UTC (rev 192901)
+++ trunk/Source/WebInspectorUI/Scripts/combine-resources.pl        2015-12-01 21:11:44 UTC (rev 192902)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> our $derivedSourcesDirectory;
</span><span class="cx"> our $htmlDirectory;
</span><span class="cx"> our $htmlFile;
</span><ins>+our $strip;
</ins><span class="cx">
</span><span class="cx"> GetOptions('output-dir=s' => \$outputDirectory,
</span><span class="cx"> 'output-script-name=s' => \$outputScriptName,
</span><span class="lines">@@ -42,10 +43,11 @@
</span><span class="cx"> 'derived-sources-dir=s' => \$derivedSourcesDirectory,
</span><span class="cx"> 'input-dir=s' => \$inputDirectory,
</span><span class="cx"> 'input-html-dir=s' => \$htmlDirectory,
</span><del>- 'input-html=s' => \$htmlFile);
</del><ins>+ 'input-html=s' => \$htmlFile,
+ 'strip' => \$strip);
</ins><span class="cx">
</span><del>-unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $outputScriptName or defined $outputStylesheetName)) {
- print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>]\n";
</del><ins>+unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $strip or defined $outputScriptName or defined $outputStylesheetName)) {
+ print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>] [--strip]\n";
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> while ($headContents =~ m/$tagExpression/gi) {
</span><span class="cx"> local $/;
</span><del>- next if $1 =~ /^Debug\//;
</del><span class="cx"> open IN, "$htmlDirectory/$1" or open IN, "$derivedSourcesDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
</span><span class="cx"> print OUT "\n" if $fileCount++;
</span><span class="cx"> print OUT "/* $1 */\n\n";
</span><span class="lines">@@ -89,12 +90,17 @@
</span><span class="cx"> # Don't use \s so we can control the newlines we consume.
</span><span class="cx"> my $replacementExpression = "([\t ]*)" . $tagExpression . "[\t ]*\n+";
</span><span class="cx">
</span><del>- # Replace the first occurance with a token so we can inject the concatenated tag in the same place
- # as the first file that got consolidated. This makes sure we preserve some order if there are other
- # items in the head that we didn't consolidate.
- $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
- $headContents =~ s/$replacementExpression//gi;
- $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
</del><ins>+ if (defined $strip) {
+ # Just strip all occurances of the pattern.
+ $headContents =~ s/$replacementExpression//gi;
+ } else {
+ # Replace the first occurance with a token so we can inject the concatenated tag in the same place
+ # as the first file that got consolidated. This makes sure we preserve some order if there are other
+ # items in the head that we didn't consolidate.
+ $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
+ $headContents =~ s/$replacementExpression//gi;
+ $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $inputDirectoryPattern = "(?!External\/)[^\"]*";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (192901 => 192902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl        2015-12-01 20:53:04 UTC (rev 192901)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl        2015-12-01 21:11:44 UTC (rev 192902)
</span><span class="lines">@@ -148,11 +148,14 @@
</span><span class="cx"> my $combineResourcesCmd = File::Spec->catfile($scriptsRoot, 'combine-resources.pl');
</span><span class="cx">
</span><span class="cx"> if ($shouldCombineMain) {
</span><ins>+ # Remove Debug JavaScript and CSS files in Production builds.
+ system($combineResourcesCmd, '--input-dir', 'Debug', '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Debug.js', '--output-style-name', 'Debug.css', '--strip');
+
</ins><span class="cx"> # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
</span><del>- system($combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
</del><ins>+ my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
+ system($combineResourcesCmd, '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
</ins><span class="cx">
</span><span class="cx"> # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
</span><del>- my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
</del><span class="cx"> system($combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
</span><span class="cx">
</span><span class="cx"> # Combine the Esprima JavaScript files in Production builds into a single file (Esprima.js).
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/View.js (192901 => 192902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/View.js        2015-12-01 20:53:04 UTC (rev 192901)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/View.js        2015-12-01 21:11:44 UTC (rev 192902)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> makeRootView()
</span><span class="cx"> {
</span><span class="cx"> console.assert(!WebInspector.View._rootView, "Root view already exists.");
</span><del>- console.assert(!this._parentView, "Root view cannot be a subview.")
</del><ins>+ console.assert(!this._parentView, "Root view cannot be a subview.");
</ins><span class="cx"> if (WebInspector.View._rootView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> didDetach()
</span><span class="cx"> {
</span><del>- console.assert(this._parentView, "Detached view has no parent.")
</del><ins>+ console.assert(this._parentView, "Detached view has no parent.");
</ins><span class="cx"> this._parentView = null;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>