Improve logic in ensureDefaultStyleSheetsForElement

Source/core/css/CSSDefaultStyleSheets.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 134 matching lines @@
         m_defaultXHTMLMobileProfileStyle = RuleSet::create();
         // Loaded stylesheet is leaked on purpose.
         RefPtrWillBeRawPtr<StyleSheetContents> stylesheet = parseUASheet(xhtmlmpCss, sizeof(xhtmlmpCss));
         m_defaultXHTMLMobileProfileStyle->addRulesFromSheet(stylesheet.release().leakRef(), screenEval());
     }
     return m_defaultXHTMLMobileProfileStyle.get();
 }
 
 void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element* element, bool& changedDefaultStyle)
 {
-    // FIXME: We should assert that the sheet only styles SVG elements.
-    if (element->isSVGElement() && !m_svgStyleSheet) {
-        m_svgStyleSheet = parseUASheet(svgCss, sizeof(svgCss));
-        m_defaultStyle->addRulesFromSheet(svgStyleSheet(), screenEval());
-        m_defaultPrintStyle->addRulesFromSheet(svgStyleSheet(), printEval());
-        changedDefaultStyle = true;
-    }
-
-    // FIXME: We should assert that the sheet only styles MathML elements.
-    if (element->namespaceURI() == MathMLNames::mathmlNamespaceURI
-        && !m_mathmlStyleSheet) {
-        m_mathmlStyleSheet = parseUASheet(mathmlCss, sizeof(mathmlCss));
-        m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval());
-        m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval());
-        changedDefaultStyle = true;
-    }
-
-    // FIXME: We should assert that this sheet only contains rules for <video> and <audio>.
-    if (!m_mediaControlsStyleSheet && (isHTMLVideoElement(*element) || isHTMLAudioElement(*element))) {
-        String mediaRules = String(mediaControlsCss, sizeof(mediaControlsCss)) + RenderTheme::theme().extraMediaControlsStyleSheet();
-        m_mediaControlsStyleSheet = parseUASheet(mediaRules);
-        m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
-        m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), printEval());
-        changedDefaultStyle = true;
+    if (element->isSVGElement()) {
+        // FIXME: We should assert that the sheet only styles SVG elements.
+        if (!m_svgStyleSheet) {
+            m_svgStyleSheet = parseUASheet(svgCss, sizeof(svgCss));
+            m_defaultStyle->addRulesFromSheet(svgStyleSheet(), screenEval());
+            m_defaultPrintStyle->addRulesFromSheet(svgStyleSheet(), printEval());
+            changedDefaultStyle = true;
+        }
+    } else if (element->namespaceURI() == MathMLNames::mathmlNamespaceURI) {
+        // FIXME: We should assert that the sheet only styles MathML elements.
+        if (!m_mathmlStyleSheet) {
+            m_mathmlStyleSheet = parseUASheet(mathmlCss, sizeof(mathmlCss));
+            m_defaultStyle->addRulesFromSheet(mathmlStyleSheet(), screenEval());
+            m_defaultPrintStyle->addRulesFromSheet(mathmlStyleSheet(), printEval());
+            changedDefaultStyle = true;
+        }
+    } else if (isHTMLVideoElement(*element) || isHTMLAudioElement(*element)) {
+        // FIXME: We should assert that this sheet only contains rules for <video> and <audio>.
+        if (!m_mediaControlsStyleSheet) {
+            String mediaRules = String(mediaControlsCss, sizeof(mediaControlsCss)) + RenderTheme::theme().extraMediaControlsStyleSheet();
+            m_mediaControlsStyleSheet = parseUASheet(mediaRules);
+            m_defaultStyle->addRulesFromSheet(mediaControlsStyleSheet(), screenEval());
+            m_defaultPrintStyle->addRulesFromSheet(mediaControlsStyleSheet(), printEval());
+            changedDefaultStyle = true;
+        }
     }
 
     // FIXME: This only works because we Force recalc the entire document so the new sheet
     // is loaded for <html> and the correct styles apply to everyone.
     if (!m_fullscreenStyleSheet && Fullscreen::isFullScreen(element->document())) {
         String fullscreenRules = String(fullscreenCss, sizeof(fullscreenCss)) + RenderTheme::theme().extraFullScreenStyleSheet();
         m_fullscreenStyleSheet = parseUASheet(fullscreenRules);
         m_defaultStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());
         m_defaultQuirksStyle->addRulesFromSheet(fullscreenStyleSheet(), screenEval());
         changedDefaultStyle = true;
@@ skipping 15 matching lines @@
     visitor->trace(m_defaultStyleSheet);
     visitor->trace(m_viewportStyleSheet);
     visitor->trace(m_quirksStyleSheet);
     visitor->trace(m_svgStyleSheet);
     visitor->trace(m_mathmlStyleSheet);
     visitor->trace(m_mediaControlsStyleSheet);
     visitor->trace(m_fullscreenStyleSheet);
 }
 
 } // namespace blink