<!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>[186477] 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/186477">186477</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 14:21:36 -0700 (Tue, 07 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Unnecessary space added after -webkit- prefixed property values
https://bugs.webkit.org/show_bug.cgi?id=146671

Reviewed by Joseph Pecoraro.

* Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css: Added.
* Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css: Added.
* Tools/PrettyPrinting/index.html:
* UserInterface/Views/CodeMirrorFormatters.js: Now only adds a space if both the current and previous
tokens are a property, value, or atom.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs">trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingcssruletestsdonotaddwhitespacebeforeprefixedpropertyvalueexpectedcss">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css</a></li>
<li><a href="#trunkSourceWebInspectorUIToolsPrettyPrintingcssruletestsdonotaddwhitespacebeforeprefixedpropertyvaluecss">trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186476 => 186477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-07-07 21:13:31 UTC (rev 186476)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-07-07 21:21:36 UTC (rev 186477)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-07  Devin Rousso  &lt;drousso@apple.com&gt;
+
+        Web Inspector: Unnecessary space added after -webkit- prefixed property values
+        https://bugs.webkit.org/show_bug.cgi?id=146671
+
+        Reviewed by Joseph Pecoraro.
+
+        * Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css: Added.
+        * Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css: Added.
+        * Tools/PrettyPrinting/index.html:
+        * UserInterface/Views/CodeMirrorFormatters.js: Now only adds a space if both the current and previous
+        tokens are a property, value, or atom.
+
</ins><span class="cx"> 2015-07-07  Matt Baker  &lt;mattbaker@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Pad ruler selection area by 1px in the Rendering Frames timeline overview
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingcssruletestsdonotaddwhitespacebeforeprefixedpropertyvalueexpectedcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css (0 => 186477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css                                (rev 0)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value-expected.css        2015-07-07 21:21:36 UTC (rev 186477)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+width: -webkit-calc(1px - 1px);
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingcssruletestsdonotaddwhitespacebeforeprefixedpropertyvaluecss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css (0 => 186477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css                                (rev 0)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css        2015-07-07 21:21:36 UTC (rev 186477)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+width: -webkit-calc(1px - 1px);
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIToolsPrettyPrintingindexhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html (186476 => 186477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html        2015-07-07 21:13:31 UTC (rev 186476)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html        2015-07-07 21:21:36 UTC (rev 186477)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx">         lineNumbers: true,
</span><span class="cx">     });
</span><span class="cx"> 
</span><ins>+    // In the frontend, keywords are added to the css mode to force the parser to recognize them as values.
+    // Here, the &quot;calc&quot; keyword is added to allow the css-rule tests to perform as they would in the frontend.
+    var modeSpec = CodeMirror.resolveMode(&quot;text/css&quot;);
+    modeSpec.valueKeywords[&quot;calc&quot;] = true;
+
</ins><span class="cx">     // Initial values from URL.
</span><span class="cx">     var queryParams = {};
</span><span class="cx">     if (window.location.search.length &gt; 0) {
</span><span class="lines">@@ -273,6 +278,7 @@
</span><span class="cx">             &quot;css-rule-tests/add-whitespace-after-colon.css&quot;,
</span><span class="cx">             &quot;css-rule-tests/add-whitespace-after-comma.css&quot;,
</span><span class="cx">             &quot;css-rule-tests/do-not-append-semicolon.css&quot;,
</span><ins>+            &quot;css-rule-tests/do-not-add-whitespace-before-prefixed-property-value.css&quot;,
</ins><span class="cx">             &quot;css-rule-tests/keep-prefixed-value.css&quot;,
</span><span class="cx">         ]);
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCodeMirrorFormattersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js (186476 => 186477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js        2015-07-07 21:13:31 UTC (rev 186476)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js        2015-07-07 21:21:36 UTC (rev 186477)
</span><span class="lines">@@ -439,7 +439,8 @@
</span><span class="cx">             return true;
</span><span class="cx"> 
</span><span class="cx">         // Add whitespace between &quot;1px_solid_green&quot;
</span><del>-        if (lastToken &amp;&amp; /\b(?:keyword|atom|number)\b/.test(token))
</del><ins>+        var tokenRegExp = /\b(?:keyword|atom|number)\b/;
+        if (tokenRegExp.test(lastToken) &amp;&amp; tokenRegExp.test(token))
</ins><span class="cx">             return true;
</span><span class="cx"> 
</span><span class="cx">         return false;
</span></span></pre>
</div>
</div>

</body>
</html>