Changeset 268966 in webkit

Timestamp:

Oct 26, 2020, 4:00:26 AM (6 years ago)

Author:

emilio

Message:

Drop sorting and deduplication of media queries.
​https://bugs.webkit.org/show_bug.cgi?id=217751

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/cssom/mediaquery-sort-dedup-expected.txt: annotate progression

Source/WebCore:

This matches what Gecko has shipped for ages.

The spec used to contain the sorting but not the de-duplication.

Both the spec and Chromium have been updated to match Gecko, see
​https://github.com/w3c/csswg-drafts/issues/5627

• css/MediaQuery.cpp:

(WebCore::MediaQuery::MediaQuery): Don't sort / dedup

Tests: imported/w3c/web-platform-tests/css/cssom/mediaquery-sort-dedup.html

LayoutTests:

• fast/media/media-query-serialization.html: Adjust to match spec.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/media/media-query-serialization.html (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/cssom/mediaquery-sort-dedup-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/MediaQuery.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-26  Emilio Cobos Álvarez  <emilio@crisal.io>
+
+        Drop sorting and deduplication of media queries.
+        https://bugs.webkit.org/show_bug.cgi?id=217751
+
+        Reviewed by Simon Fraser.
+
+        * fast/media/media-query-serialization.html: Adjust to match spec.
+
 2020-10-26  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/LayoutTests/fast/media/media-query-serialization.html

@@ -17 +17 @@
 
 
-var expected = "not braille, tv and (max-width: 200px) and (min-width: 100px) and (orientation: landscape), (color)";
+var expected = "not braille, tv and (orientation: landscape) and (min-width: 100px) and (max-width: 200px), (color) and (color)";
 shouldBe("document.styleSheets[0].media.mediaText", "expected");
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-10-26  Emilio Cobos Álvarez  <emilio@crisal.io>
+
+        Drop sorting and deduplication of media queries.
+        https://bugs.webkit.org/show_bug.cgi?id=217751
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/cssom/mediaquery-sort-dedup-expected.txt: annotate progression
+
 2020-10-25  Emilio Cobos Álvarez  <emilio@crisal.io>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/mediaquery-sort-dedup-expected.txt

@@ -1 +1 @@
 
-FAIL Media queries are not sorted lexicographically assert_equals: expected "(min-width: 10px) and (min-height: 10px)" but got "(min-height: 10px) and (min-width: 10px)"
-FAIL Media queries are not deduplicated assert_equals: expected "(color) and (color)" but got "(color)"
+PASS Media queries are not sorted lexicographically
+PASS Media queries are not deduplicated
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-26  Emilio Cobos Álvarez  <emilio@crisal.io>
+
+        Drop sorting and deduplication of media queries.
+        https://bugs.webkit.org/show_bug.cgi?id=217751
+
+        Reviewed by Simon Fraser.
+
+        This matches what Gecko has shipped for ages.
+
+        The spec used to contain the sorting but not the de-duplication.
+
+        Both the spec and Chromium have been updated to match Gecko, see
+        https://github.com/w3c/csswg-drafts/issues/5627
+
+        * css/MediaQuery.cpp:
+        (WebCore::MediaQuery::MediaQuery): Don't sort / dedup
+
+        Tests: imported/w3c/web-platform-tests/css/cssom/mediaquery-sort-dedup.html
+
 2020-10-25  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/css/MediaQuery.cpp

@@ -75 +75 @@
     , m_restrictor(restrictor)
 {
-    std::sort(m_expressions.begin(), m_expressions.end(), [](auto& a, auto& b) {
-        return codePointCompare(a.serialize(), b.serialize()) < 0;
-    });
-
-    // Remove all duplicated expressions.
-    String key;
-    for (int i = m_expressions.size() - 1; i >= 0; --i) {
-
-        // If any expression is invalid the media query must be ignored.
-        if (!m_ignored)
-            m_ignored = !m_expressions[i].isValid();
-
-        if (m_expressions[i].serialize() == key)
-            m_expressions.remove(i);
-        else
-            key = m_expressions[i].serialize();
-    }
 }