Bug 1426516: Remove Valgrind workaround to make ::slotted use the rule hash. r=me
authorEmilio Cobos Álvarez <emilio@crisal.io>
Mon, 23 Apr 2018 18:46:10 +0200
changeset 468688 a5dcdb37129d7ee74288c8a6c99a37924357fb3f
parent 468687 a5dad10abab907953d379a0a2a6c3b198a4255d6
child 468689 bfc5f524402eb6545090da94477c2409b0be4252
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1426516
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426516: Remove Valgrind workaround to make ::slotted use the rule hash. r=me MozReview-Commit-ID: 2q14kHjajIr
servo/components/style/selector_map.rs
--- a/servo/components/style/selector_map.rs
+++ b/servo/components/style/selector_map.rs
@@ -449,23 +449,17 @@ fn specific_bucket_for<'a>(component: &'
         //    Combinator(SlotAssignment),
         //    Slotted(span),
         //    Combinator::PseudoElement,
         //    PseudoElement(::before),
         //  ]
         //
         // So inserting `span` in the rule hash makes sense since we want to
         // match the slotted <span>.
-        //
-        // FIXME(emilio, bug 1426516): The line below causes valgrind failures
-        // and it's probably a false positive, we should uncomment whenever
-        // jseward is back to confirm / whitelist it.
-        //
-        // Meanwhile taking the code path below is slower, but still correct.
-        // Component::Slotted(ref selector) => find_bucket(selector.iter()),
+        Component::Slotted(ref selector) => find_bucket(selector.iter()),
         Component::Host(Some(ref selector)) => find_bucket(selector.iter()),
         _ => Bucket::Universal,
     }
 }
 
 /// Searches a compound selector from left to right, and returns the appropriate
 /// bucket for it.
 #[inline(always)]