From a23596d377f00fd7706549896630f8908b474797 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Wed, 23 Aug 2017 16:32:19 +0800
Subject: [PATCH] Improve debug log related to selector matching

Move debug log in matches_complex_selector_internal to the front so that the
entire complex selector can be printed.

MozReview-Commit-ID: KXBDpbzBv0I
---
 components/selectors/matching.rs   | 6 +++---
 components/style/style_resolver.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index a29299c4794..b9b2da857d8 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -519,13 +519,13 @@ fn matches_complex_selector_internal<E, F>(mut selector_iter: SelectorIter<E::Im
 {
     *relevant_link = relevant_link.examine_potential_link(element, &mut context.shared);
 
+    debug!("Matching complex selector {:?} for {:?}, relevant link {:?}",
+           selector_iter, element, relevant_link);
+
     let matches_all_simple_selectors = selector_iter.all(|simple| {
         matches_simple_selector(simple, element, context, &relevant_link, flags_setter)
     });
 
-    debug!("Matching for {:?}, simple selector {:?}, relevant link {:?}",
-           element, selector_iter, relevant_link);
-
     let combinator = selector_iter.next_sequence();
     let siblings = combinator.map_or(false, |c| c.is_sibling());
     if siblings {
diff --git a/components/style/style_resolver.rs b/components/style/style_resolver.rs
index 07217384ab9..18b29162bcb 100644
--- a/components/style/style_resolver.rs
+++ b/components/style/style_resolver.rs
@@ -356,7 +356,7 @@ where
         );
 
         if log_enabled!(Trace) {
-            trace!("Matched rules:");
+            trace!("Matched rules for {:?}:", self.element);
             for rn in rule_node.self_and_ancestors() {
                 let source = rn.style_source();
                 if source.is_some() {