Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1336646 - Move opts check for statistics into should_dump. r=emilio
This makes things more consistent between the parallel and sequential traversal drivers.
  • Loading branch information
bholley committed Feb 9, 2017
1 parent e7a8f5e commit 37b8d52
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion components/style/context.rs
Expand Up @@ -15,6 +15,7 @@ use euclid::Size2D;
use matching::StyleSharingCandidateCache;
use parking_lot::RwLock;
use properties::ComputedValues;
use servo_config::opts;
use std::collections::HashMap;
use std::env;
use std::fmt;
Expand Down Expand Up @@ -160,7 +161,7 @@ lazy_static! {
impl TraversalStatistics {
/// Returns whether statistics dumping is enabled.
pub fn should_dump() -> bool {
*DUMP_STYLE_STATISTICS
*DUMP_STYLE_STATISTICS || opts::get().style_sharing_stats
}
}

Expand Down
3 changes: 1 addition & 2 deletions components/style/parallel.rs
Expand Up @@ -26,7 +26,6 @@ use context::TraversalStatistics;
use dom::{OpaqueNode, SendNode, TElement, TNode};
use rayon;
use scoped_tls::ScopedTLS;
use servo_config::opts;
use std::borrow::Borrow;
use traversal::{DomTraversal, PerLevelTraversalData, PreTraverseToken};

Expand Down Expand Up @@ -75,7 +74,7 @@ pub fn traverse_dom<E, D>(traversal: &D,
});

// Dump statistics to stdout if requested.
if TraversalStatistics::should_dump() || opts::get().style_sharing_stats {
if TraversalStatistics::should_dump() {
let slots = unsafe { tls.unsafe_get() };
let aggregate = slots.iter().fold(TraversalStatistics::default(), |acc, t| {
match *t.borrow() {
Expand Down

0 comments on commit 37b8d52

Please sign in to comment.