Changeset 174615 in webkit

Timestamp:

Oct 10, 2014, 3:38:37 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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 <Joseph Pecoraro> 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):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-user-interface-resources-dryrun.rb (added)
• Scripts/cssmin.py (modified) (1 diff, 1 prop)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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):
+
 2014-10-09  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/Scripts/cssmin.py

@@ -31 +31 @@
         (r"\n", ""),                   # delete new lines
         (r"\s+", " "),                 # change multiple spaces to one space
-        (r"\s?([;:{},+>])\s?", r"\1"), # delete space where it is not needed
+        (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.
         (r";}", "}")                   # change ';}' to '}' because the semicolon is not needed
     )