Fix serialization of namespace and universal selectors #16890

SimonSapin · 2017-05-16T14:50:25Z

This change is


        Fix serialization of namespace and universal selectors

Fix #16017 Fix #16020

highfive · 2017-05-16T14:50:30Z

Heads up! This PR modifies the following files:

@bholley: components/style/stylist.rs
@emilio: components/style/stylist.rs

SimonSapin · 2017-05-16T14:50:32Z

r? @emilio

emilio · 2017-05-16T14:59:38Z

components/style/stylist.rs

-            if rule.selector.inner.complex.iter_raw().next().is_none() {
-                rules_list.push(rule.to_applicable_declaration_block(cascade_level));
+            let mut iter = rule.selector.inner.complex.iter_raw();
+            match iter.next() {


can you move it to a method in Selector? I'm also tweaking this code for the pseudo-element things. Also, it might look cleaner that way.

Done (in a separate commit).

SimonSapin · 2017-05-16T15:19:45Z

@bors-servo try

bors-servo · 2017-05-16T15:19:49Z

⌛ Trying commit 07f3854 with merge 77aa36f...


        Auto merge of #16890 - servo:qname, r=<try>

Fix serialization of namespace and universal selectors Fix #16017 Fix #16020  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16890)

emilio

r=me, with the Combinator bit either explained, or fixed.

emilio · 2017-05-16T16:06:49Z

components/selectors/parser.rs

+        self.inner.complex.iter_raw().all(|c| matches!(*c,
+            Component::ExplicitUniversalType |
+            Component::ExplicitAnyNamespace |
+            Component::Combinator(_)


Does this really need combinators? When is that the case?

emilio · 2017-05-16T16:07:08Z

Also, presumably a Gecko try run would be nice :)


        Move "is universal" logic from stylist.rs to selectors/parser.rs

SimonSapin · 2017-05-16T16:42:31Z

@bors-servo r=emilio

bors-servo · 2017-05-16T16:42:32Z

📌 Commit 685b9ef has been approved by emilio

SimonSapin · 2017-05-16T16:51:08Z

https://treeherder.mozilla.org/#/jobs?repo=try&revision=a94e5188bdb08ab61b1bd4e8bb1fa6de4f5daf67

SimonSapin · 2017-05-16T18:21:53Z

https://treeherder.mozilla.org/#/jobs?repo=try&revision=a94e5188bdb08ab61b1bd4e8bb1fa6de4f5daf67

TEST-UNEXPECTED-FAIL | layout/style/test/test_namespace_rule.html | failures in this test - expected 16 failures but got 8 [log…]
TEST-UNEXPECTED-FAIL | layout/style/test/test_selectors.html | failure pattern `:not()` in this test - expected 8 failures but got 0 [log…]
TEST-UNEXPECTED-FAIL | layout/style/test/test_selectors.html | failure pattern `:not(html|)` in this test - expected 1 failures but got 0 [log…]
TEST-UNEXPECTED-FAIL | layout/style/test/test_selectors.html | failure pattern `reserialization of *|a` in this test - expected 6 failures but got 0 [log…]
TEST-UNEXPECTED-FAIL | layout/style/test/test_selectors.html | failure pattern `this_better_be_unvisited` in this test - expected 1 failures but got 0 [log…]

diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md
index 991863bacf0d..8dc19a70c809 100644
--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -91,7 +91,7 @@ to mochitest command.
   * ... `font-feature-settings`: bug 1355366 [10]
 * test_font_face_parser.html `font-weight`: keyword values should be preserved in \@font-face [4]
 * @namespace support:
-  * test_namespace_rule.html: bug 1355715 [16]
+  * test_namespace_rule.html: bug 1355715 [8]
 * test_dont_use_document_colors.html: support of disabling document color bug 1355716 [21]
 * test_font_feature_values_parsing.html: \@font-feature-values support bug 1355721 [107]
 * Grid support bug 1341802
@@ -144,11 +144,6 @@ to mochitest command.
 * Incorrect serialization
   * color value not canonicalized servo/servo#15397
     * test_shorthand_property_getters.html `should condense to canonical case` [2]
-  * :not(*) doesn't serialize properly servo/servo#16017
-    * test_selectors.html `:not()` [8]
-    * ... `:not(html|)` [1]
-  * "*|a" gets serialized as "a" when it should not servo/servo#16020
-    * test_selectors.html `reserialization of *|a` [6]
   * place-{content,items,self} shorthands bug 1363971
     * test_align_shorthand_serialization.html [6]
   * system font serialization with subprop specified bug 1364286
@@ -193,7 +188,6 @@ to mochitest command.
 * test_css_supports.html: issues around @supports syntax servo/servo#15482 [8]
 * test_author_specified_style.html: support serializing color as author specified bug 1348165 [27]
 * browser_newtab_share_rule_processors.js: agent style sheet sharing [1]
-* test_selectors.html `this_better_be_unvisited`: visited handling [1]
 
 ## Assertions

SimonSapin · 2017-05-16T18:57:40Z

@bors-servo p=2

so I can push expectation updates tonight.

bors-servo · 2017-05-16T20:40:45Z

⌛ Testing commit 685b9ef with merge 825a623...


        Auto merge of #16890 - servo:qname, r=emilio

Fix serialization of namespace and universal selectors Fix #16017 Fix #16020  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16890)

bors-servo · 2017-05-16T21:13:40Z

💔 Test failed - mac-dev-unit

emilio · 2017-05-16T21:15:52Z

@bors-servo retry

mach package?

emilio · 2017-05-16T21:16:06Z

@bors-servo p=10

I want to land my pseudo stuff after this.

bors-servo · 2017-05-16T23:19:16Z

💔 Test failed - linux-rel-wpt


        Auto merge of #16900 - emilio:pseudos, r=bholley

Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley On top of #16890.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16900)

jdm · 2017-05-17T00:29:10Z

@bors-servo: retry

#16901

bors-servo · 2017-05-17T01:03:55Z

⌛ Testing commit 685b9ef with merge c962458...


        Auto merge of #16890 - servo:qname, r=emilio

Fix serialization of namespace and universal selectors Fix #16017 Fix #16020  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16890)

bors-servo · 2017-05-17T02:27:44Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: emilio
Pushing c962458 to master...

heycam · 2017-05-17T04:02:47Z

I landed the expectation changes: https://hg.mozilla.org/integration/autoland/rev/692a837347e3544cd7d1b86a63775ff5255caf7a


        Auto merge of #16900 - emilio:pseudos, r=bholley

Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley On top of #16890.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16900)


        Bug 1341102: Update test expectations for servo/servo#16890. r=me

--HG-- extra : rebase_source : afc2761104c692740d066d84f4cc207d4adbf0f0


        Auto merge of #16900 - emilio:pseudos, r=bholley

Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley On top of #16890.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16900)


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c


        Bug 1341102: Update test expectations for servo/servo#16890. r=me


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 12c4ec9e73c7d9b747303a5629b20719db05f03a


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c


        Bug 1341102: Update test expectations for servo/servo#16890. r=me


        Bug 1341102: Update test expectations for servo/servo#16890. r=me

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c UltraBlame original commit: a6a6ead43673799a3cdb1c008b47a646a7f816e2


        Bug 1341102: Update test expectations for servo/servo#16890. r=me

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c UltraBlame original commit: a6a6ead43673799a3cdb1c008b47a646a7f816e2


        Bug 1341102: Update test expectations for servo/servo#16890. r=me

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a


        servo: Merge #16900 - Bug 1364850: Move PseudoElement to be just anot…

…her combinator in selectors. r=bholley (from emilio:pseudos); r=bholley On top of servo/servo#16890. Source-Repo: https://github.com/servo/servo Source-Revision: d8b7013fcddff79a9c879077e1a564d83201359c UltraBlame original commit: a6a6ead43673799a3cdb1c008b47a646a7f816e2

Fix serialization of namespace and universal selectors

Loading status checks…

390e688

Fix #16017 Fix #16020

highfive assigned Manishearth May 16, 2017

highfive added the S-awaiting-review label May 16, 2017

highfive assigned emilio and unassigned Manishearth May 16, 2017

emilio reviewed May 16, 2017

View changes

emilio approved these changes May 16, 2017

View changes

Move "is universal" logic from stylist.rs to selectors/parser.rs

Loading status checks…

685b9ef

SimonSapin force-pushed the qname branch from 07f3854 to 685b9ef May 16, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels May 16, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels May 16, 2017

emilio mentioned this pull request May 16, 2017

Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley #16900

Merged

highfive added S-awaiting-merge and removed S-tests-failed labels May 16, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels May 16, 2017

highfive added S-awaiting-merge and removed S-tests-failed labels May 17, 2017

highfive removed the S-awaiting-merge label May 17, 2017

SimonSapin deleted the qname branch May 17, 2017

moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request May 17, 2017

Bug 1341102: Update test expectations for servo/servo#16890. r=me

3843333

--HG-- extra : rebase_source : afc2761104c692740d066d84f4cc207d4adbf0f0

aethanyc pushed a commit to aethanyc/gecko-dev that referenced this pull request May 17, 2017

Bug 1341102: Update test expectations for servo/servo#16890. r=me

4ffd1ba

JerryShih pushed a commit to JerryShih/gecko-dev that referenced this pull request May 18, 2017

Bug 1341102: Update test expectations for servo/servo#16890. r=me

921c2be

gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019

Bug 1341102: Update test expectations for servo/servo#16890. r=me

e060cbd

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a

gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019

Bug 1341102: Update test expectations for servo/servo#16890. r=me

3716e44

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a

gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019

Bug 1341102: Update test expectations for servo/servo#16890. r=me

b7b0ff3

UltraBlame original commit: 692a837347e3544cd7d1b86a63775ff5255caf7a

servo / servo

Fix serialization of namespace and universal selectors #16890

Fix serialization of namespace and universal selectors #16890

SimonSapin commented May 16, 2017 •

edited by larsbergstrom

highfive commented May 16, 2017

SimonSapin commented May 16, 2017

This comment has been minimized.

This comment has been minimized.

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

emilio left a comment

This comment has been minimized.

emilio commented May 16, 2017

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

SimonSapin commented May 16, 2017

SimonSapin commented May 16, 2017 •

edited

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

bors-servo commented May 16, 2017

emilio commented May 16, 2017

emilio commented May 16, 2017

bors-servo commented May 16, 2017

jdm commented May 17, 2017

bors-servo commented May 17, 2017

bors-servo commented May 17, 2017

heycam commented May 17, 2017

servo / servo

Join GitHub today

Fix serialization of namespace and universal selectors #16890

Fix serialization of namespace and universal selectors #16890

Conversation

SimonSapin commented May 16, 2017 • edited by larsbergstrom

highfive commented May 16, 2017

SimonSapin commented May 16, 2017

This comment has been minimized.

emilio May 16, 2017

This comment has been minimized.

SimonSapin May 16, 2017

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

emilio left a comment

This comment has been minimized.

emilio May 16, 2017

emilio commented May 16, 2017

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

SimonSapin commented May 16, 2017

SimonSapin commented May 16, 2017 • edited

SimonSapin commented May 16, 2017

bors-servo commented May 16, 2017

bors-servo commented May 16, 2017

emilio commented May 16, 2017

emilio commented May 16, 2017

bors-servo commented May 16, 2017

jdm commented May 17, 2017

bors-servo commented May 17, 2017

bors-servo commented May 17, 2017

heycam commented May 17, 2017

SimonSapin commented May 16, 2017 •

edited by larsbergstrom

SimonSapin commented May 16, 2017 •

edited