<!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>[174615] 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/174615">174615</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-10 15:38:37 -0700 (Fri, 10 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CSS minification should not strip whitespace around calc +/- binary operators
https://bugs.webkit.org/show_bug.cgi?id=137624
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-10-10
Reviewed by Timothy Hatcher.
Be careful when stripping whitespace around "+". We want to strip for
selectors "a + b" but not for calc expressions "calc(1px + 2px)".
This is not a perfect solution, but it does a good job. It may still break
with more complex calc expressions, like "calc(1px + calc())" but this
handles the basics.
* Scripts/copy-user-interface-resources-dryrun.rb: Added.
* Scripts/cssmin.py:
(cssminify):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscssminpy">trunk/Source/WebInspectorUI/Scripts/cssmin.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesdryrunrb">trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIScriptscssminpy">trunk/Source/WebInspectorUI/Scripts/cssmin.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (174614 => 174615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-10-10 22:29:20 UTC (rev 174614)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-10-10 22:38:37 UTC (rev 174615)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-10 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CSS minification should not strip whitespace around calc +/- binary operators
+ https://bugs.webkit.org/show_bug.cgi?id=137624
+
+ Reviewed by Timothy Hatcher.
+
+ Be careful when stripping whitespace around "+". We want to strip for
+ selectors "a + b" but not for calc expressions "calc(1px + 2px)".
+
+ This is not a perfect solution, but it does a good job. It may still break
+ with more complex calc expressions, like "calc(1px + calc())" but this
+ handles the basics.
+
+ * Scripts/copy-user-interface-resources-dryrun.rb: Added.
+ * Scripts/cssmin.py:
+ (cssminify):
+
</ins><span class="cx"> 2014-10-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: DOM Storage Editing is broken in many ways, frustrating
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscopyuserinterfaceresourcesdryrunrb"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb (0 => 174615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb (rev 0)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb 2014-10-10 22:38:37 UTC (rev 174615)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+#!/usr/bin/ruby
+
+require 'fileutils'
+require 'tmpdir'
+
+if ARGV.size != 1
+ puts "usage: #{File.basename $0} <output-directory>"
+ exit 1
+end
+
+WEB_INSPECTOR_PATH = File.expand_path File.join(File.dirname(__FILE__), "..")
+COPY_USER_INTERFACE_RESOURCES_PATH = File.join WEB_INSPECTOR_PATH, "Scripts", "copy-user-interface-resources.pl"
+
+$output_directory = File.expand_path ARGV[0]
+
+Dir.mktmpdir do |tmpdir|
+
+ # Create the output directory if needed.
+ FileUtils.mkdir_p $output_directory
+
+ # Create empty derived sources expected to exist.
+ FileUtils.touch(File.join(tmpdir, 'InspectorJSBackendCommands.js'))
+ FileUtils.touch(File.join(tmpdir, 'InspectorWebBackendCommands.js'))
+
+ # Setup the environment and run.
+ ENV["DERIVED_SOURCES_DIR"] = tmpdir
+ ENV["JAVASCRIPTCORE_PRIVATE_HEADERS_DIR"] = tmpdir
+ ENV["WEBCORE_PRIVATE_HEADERS_DIR"] = tmpdir
+ ENV["SRCROOT"] = WEB_INSPECTOR_PATH
+ ENV["TARGET_BUILD_DIR"] = $output_directory
+ ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"] = ""
+ ENV["COMBINE_INSPECTOR_RESOURCES"] = "YES"
+ exec COPY_USER_INTERFACE_RESOURCES_PATH
+
+end
</ins><span class="cx">Property changes on: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-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="trunkSourceWebInspectorUIScriptscssminpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/cssmin.py (174614 => 174615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/cssmin.py 2014-10-10 22:29:20 UTC (rev 174614)
+++ trunk/Source/WebInspectorUI/Scripts/cssmin.py 2014-10-10 22:38:37 UTC (rev 174615)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> (r"\/\*.*?\*\/", ""), # delete comments
</span><span class="cx"> (r"\n", ""), # delete new lines
</span><span class="cx"> (r"\s+", " "), # change multiple spaces to one space
</span><del>- (r"\s?([;:{},+>])\s?", r"\1"), # delete space where it is not needed
</del><ins>+ (r"\s?([;:{},~>])\s?", r"\1"), # delete space where it is not needed
+ (r"\s?([-+])(?:\s(?![0-9(]))", r"\1"), # delete whitespace around + and - when not followed by a number or paren. E.g. strip for selector "a + b" but not "calc(a + b)" which requires spaces.
</ins><span class="cx"> (r";}", "}") # change ';}' to '}' because the semicolon is not needed
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">Property changes on: trunk/Source/WebInspectorUI/Scripts/cssmin.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>