Title: [198164] trunk/Source/WebInspectorUI
Revision
198164
Author
[email protected]
Date
2016-03-14 15:22:24 -0700 (Mon, 14 Mar 2016)

Log Message

Web Inspector: cssmin.py does not handle calc(var(--toolbar-height) + var(--tab-bar-height))

https://bugs.webkit.org/show_bug.cgi?id=155464
rdar://problem/25152196

Reviewed by Joseph Pecoraro.

* Scripts/cssmin.py:
(cssminify): Check for var when stripping spaces around + and -.

* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype._viewModeDidChange):
Drive-by fix to add a missing semi-colon found by the copy-user-interface-resources-dryrun.rb script.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (198163 => 198164)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-14 22:08:32 UTC (rev 198163)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-14 22:22:24 UTC (rev 198164)
@@ -1,3 +1,19 @@
+2016-03-14  Timothy Hatcher  <[email protected]>
+
+        Web Inspector: cssmin.py does not handle calc(var(--toolbar-height) + var(--tab-bar-height))
+
+        https://bugs.webkit.org/show_bug.cgi?id=155464
+        rdar://problem/25152196
+
+        Reviewed by Joseph Pecoraro.
+
+        * Scripts/cssmin.py:
+        (cssminify): Check for var when stripping spaces around + and -.
+
+        * UserInterface/Views/TimelineOverview.js:
+        (WebInspector.TimelineOverview.prototype._viewModeDidChange):
+        Drive-by fix to add a missing semi-colon found by the copy-user-interface-resources-dryrun.rb script.
+
 2016-03-14  Joseph Pecoraro  <[email protected]>
 
         Reduce generated JSON HeapSnapshot size

Modified: trunk/Source/WebInspectorUI/Scripts/cssmin.py (198163 => 198164)


--- trunk/Source/WebInspectorUI/Scripts/cssmin.py	2016-03-14 22:08:32 UTC (rev 198163)
+++ trunk/Source/WebInspectorUI/Scripts/cssmin.py	2016-03-14 22:22:24 UTC (rev 198164)
@@ -32,7 +32,7 @@
         (r"\s+", " "),                 # change multiple spaces to one space
         (r"\s?([;{},~>!])\s?", r"\1"), # delete space where it is not needed
         (r":\s", ":"),                 # delete spaces after colons, but not before. E.g. do not break selectors "a :focus", "b :matches(...)", "c :not(...)" where the leading space is significant
-        (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"\s?([-+])(?:\s(?![0-9(])(?!var))", r"\1"), # delete whitespace around + and - when not followed by a number, paren, or var(). E.g. strip for selector "a + b" but not "calc(a + b)" which requires spaces.
         (r";}", "}")                   # change ';}' to '}' because the semicolon is not needed
     )
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (198163 => 198164)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js	2016-03-14 22:08:32 UTC (rev 198163)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js	2016-03-14 22:22:24 UTC (rev 198164)
@@ -738,7 +738,7 @@
 
         for (let [type, overviewGraph] of this._overviewGraphsByTypeMap) {
             let treeElement = this._treeElementsByTypeMap.get(type);
-            console.assert(treeElement, "Missing tree element for timeline type", type)
+            console.assert(treeElement, "Missing tree element for timeline type", type);
 
             treeElement.hidden = !this._canShowTimelineType(type);
             if (treeElement.hidden)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to