Auto merge of #5608 - pgonda:cmdline-disable-style-sharing, r=Ms2ger

Let me know if I should fix anything, or how I could implement a test if needed.  I looked at some testing in servo/ports/command_line.rs but it did not seem to apply.

Thanks!

1 files changed, 4 insertions, 0 deletions

diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index 1c977c8081b..2331afc65b2 100644
--- a/components/layout/css/matching.rs
+++ b/components/layout/css/matching.rs
@@ -32,6 +32,7 @@ use style::properties::{ComputedValues, cascade};
 use style::selector_matching::{Stylist, DeclarationBlock};
 use util::arc_ptr_eq;
 use util::cache::{LRUCache, SimpleHashCache};
+use util::opts;
 use util::smallvec::{SmallVec, SmallVec16};
 
 pub struct ApplicableDeclarations {
@@ -564,6 +565,9 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
                                         &mut StyleSharingCandidateCache,
                                       parent: Option<LayoutNode>)
                                       -> StyleSharingResult {
+        if opts::get().disable_share_style_cache {
+            return StyleSharingResult::CannotShare(false)
+        }
         if !self.is_element() {
             return StyleSharingResult::CannotShare(false)
         }