From e5df6fa753b57b5df5b3534456dbd93743e286f5 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 15 Oct 2015 10:38:27 +0200
Subject: [PATCH] Improve code flow in share_style_if_possible.

---
 components/layout/css/matching.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index 439ecf842cf..9fc903a4f29 100644
--- a/components/layout/css/matching.rs
+++ b/components/layout/css/matching.rs
@@ -580,15 +580,16 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
         if opts::get().disable_share_style_cache {
             return StyleSharingResult::CannotShare(false)
         }
-        let ok = {
-            if let Some(element) = self.as_element() {
-                element.style_attribute().is_none() &&
-                    element.get_attr(&ns!(""), &atom!("id")).is_none()
-            } else {
-                false
-            }
+
+        let element = match self.as_element() {
+            Some(element) => element,
+            None => return StyleSharingResult::CannotShare(false),
         };
-        if !ok {
+
+        if element.style_attribute().is_some() {
+            return StyleSharingResult::CannotShare(false)
+        }
+        if element.get_attr(&ns!(""), &atom!("id")).is_some() {
             return StyleSharingResult::CannotShare(false)
         }