Remove StyleResolverState::styledElement() since we can just check isHTMLElement() or isSVGElement()

Source/core/css/resolver/StyleResolver.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, 2013 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 438 matching lines @@
 
 void StyleResolver::matchAllRules(ElementRuleCollector& collector, bool matchAuthorAndUserStyles, bool includeSMILProperties)
 {
     matchUARules(collector);
 
     // Now we check user sheet rules.
     if (matchAuthorAndUserStyles)
         matchUserRules(collector, false);
 
     // Now check author rules, beginning first with presentational attributes mapped from HTML.
-    if (m_state.styledElement()) {
-        collector.addElementStyleProperties(m_state.styledElement()->presentationAttributeStyle());
+    if (m_state.element()->isStyledElement()) {
+        collector.addElementStyleProperties(m_state.element()->presentationAttributeStyle());
 
         // Now we check additional mapped declarations.
         // Tables and table cells share an additional mapped rule that must be applied
         // after all attributes, since their mapped style depends on the values of multiple attributes.
-        collector.addElementStyleProperties(m_state.styledElement()->additionalPresentationAttributeStyle());
+        collector.addElementStyleProperties(m_state.element()->additionalPresentationAttributeStyle());
 
-        if (m_state.styledElement()->isHTMLElement()) {
+        if (m_state.element()->isHTMLElement()) {
             bool isAuto;
-            TextDirection textDirection = toHTMLElement(m_state.styledElement())->directionalityIfhasDirAutoAttribute(isAuto);
+            TextDirection textDirection = toHTMLElement(m_state.element())->directionalityIfhasDirAutoAttribute(isAuto);
             if (isAuto)
                 collector.matchedResult().addMatchedProperties(textDirection == LTR ? leftToRightDeclaration() : rightToLeftDeclaration());
         }
     }
 
     // Check the rules in author sheets next.
     if (matchAuthorAndUserStyles)
         matchAuthorRules(collector, false);
 
-    // Now check our inline style attribute.
-    if (matchAuthorAndUserStyles && m_state.styledElement() && m_state.styledElement()->inlineStyle()) {
-        // Inline style is immutable as long as there is no CSSOM wrapper.
-        // FIXME: Media control shadow trees seem to have problems with caching.
-        bool isInlineStyleCacheable = !m_state.styledElement()->inlineStyle()->isMutable() && !m_state.styledElement()->isInShadowTree();
-        // FIXME: Constify.
-        collector.addElementStyleProperties(m_state.styledElement()->inlineStyle(), isInlineStyleCacheable);
+    if (m_state.element()->isStyledElement()) {
+        // Now check our inline style attribute.
+        if (matchAuthorAndUserStyles && m_state.element()->inlineStyle()) {
+            // Inline style is immutable as long as there is no CSSOM wrapper.
+            // FIXME: Media control shadow trees seem to have problems with caching.
+            bool isInlineStyleCacheable = !m_state.element()->inlineStyle()->isMutable() && !m_state.element()->isInShadowTree();
+            // FIXME: Constify.
+            collector.addElementStyleProperties(m_state.element()->inlineStyle(), isInlineStyleCacheable);
+        }
+
+        // Now check SMIL animation override style.
+        if (includeSMILProperties && matchAuthorAndUserStyles && m_state.element()->isSVGElement())
+            collector.addElementStyleProperties(toSVGElement(m_state.element())->animatedSMILStyleProperties(), false /* isCacheable */);
+
+        if (m_state.element()->hasActiveAnimations())
+            collector.matchedResult().isCacheable = false;
     }
-
-    // Now check SMIL animation override style.
-    if (includeSMILProperties && matchAuthorAndUserStyles && m_state.styledElement() && m_state.styledElement()->isSVGElement())
-        collector.addElementStyleProperties(toSVGElement(m_state.styledElement())->animatedSMILStyleProperties(), false /* isCacheable */);
-
-    if (m_state.styledElement() && m_state.styledElement()->hasActiveAnimations())
-        collector.matchedResult().isCacheable = false;
 }
 
 static const unsigned cStyleSearchThreshold = 10;
 static const unsigned cStyleSearchLevelThreshold = 10;
 
 static inline bool parentElementPreventsSharing(const Element* parentElement)
 {
     if (!parentElement)
         return false;
     return parentElement->hasFlagsSetDuringStylingOfChildren();
@@ skipping 124 matching lines @@
         if (context.element()->isSVGElement()) {
             if (context.element()->getAttribute(classAttr) != sharingCandidate->getAttribute(classAttr))
                 return false;
         } else if (context.element()->classNames() != sharingCandidate->classNames()) {
             return false;
         }
     } else {
         return false;
     }
 
-    if (context.styledElement()->presentationAttributeStyle() != sharingCandidate->presentationAttributeStyle())
+    if (context.element()->presentationAttributeStyle() != sharingCandidate->presentationAttributeStyle())
         return false;
 
     if (context.element()->hasTagName(progressTag)) {
         if (context.element()->shouldAppearIndeterminate() != sharingCandidate->shouldAppearIndeterminate())
             return false;
     }
 
     return true;
 }
 
@@ skipping 21 matching lines @@
     if (element->active() != context.element()->active())
         return false;
     if (element->focused() != context.element()->focused())
         return false;
     if (element->shadowPseudoId() != context.element()->shadowPseudoId())
         return false;
     if (element == element->document()->cssTarget())
         return false;
     if (!sharingCandidateHasIdenticalStyleAffectingAttributes(context, element))
         return false;
-    if (element->additionalPresentationAttributeStyle() != context.styledElement()->additionalPresentationAttributeStyle())
+    if (element->additionalPresentationAttributeStyle() != context.element()->additionalPresentationAttributeStyle())
         return false;
 
     if (element->hasID() && m_features.idsInRules.contains(element->idForStyleResolution().impl()))
         return false;
     if (element->hasScopedHTMLStyleChild())
         return false;
 
     // FIXME: We should share style for option and optgroup whenever possible.
     // Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems
     // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cgi?id=88405
@@ skipping 48 matching lines @@
         if (canShareStyleWithElement(context, toElement(node)))
             break;
         if (count++ == cStyleSearchThreshold)
             return 0;
     }
     return toElement(node);
 }
 
 RenderStyle* StyleResolver::locateSharedStyle(const ElementResolveContext& context)
 {
-    if (!context.styledElement())
+    if (!context.element() || !context.element()->isStyledElement())
         return 0;
 
     // If the element has inline style it is probably unique.
-    if (context.styledElement()->inlineStyle())
+    if (context.element()->inlineStyle())
         return 0;
-    if (context.styledElement()->isSVGElement() && toSVGElement(context.styledElement())->animatedSMILStyleProperties())
+    if (context.element()->isSVGElement() && toSVGElement(context.element())->animatedSMILStyleProperties())
         return 0;
     // Ids stop style sharing if they show up in the stylesheets.
-    if (context.styledElement()->hasID() && m_features.idsInRules.contains(context.styledElement()->idForStyleResolution().impl()))
+    if (context.element()->hasID() && m_features.idsInRules.contains(context.element()->idForStyleResolution().impl()))
         return 0;
     // Active and hovered elements always make a chain towards the document node
     // and no siblings or cousins will have the same state.
-    if (context.styledElement()->hovered())
+    if (context.element()->hovered())
         return 0;
-    if (context.styledElement()->active())
+    if (context.element()->active())
         return 0;
     // There is always only one focused element.
-    if (context.styledElement()->focused())
+    if (context.element()->focused())
         return 0;
     if (parentElementPreventsSharing(context.element()->parentElement()))
         return 0;
-    if (context.styledElement()->hasScopedHTMLStyleChild())
+    if (context.element()->hasScopedHTMLStyleChild())
         return 0;
     if (context.element() == context.document()->cssTarget())
         return 0;
     if (elementHasDirectionAuto(context.element()))
         return 0;
     if (context.element()->hasActiveAnimations())
         return 0;
     // When a dialog is first shown, its style is mutated to center it in the
     // viewport. So the styles can't be shared since the viewport position and
     // size may be different each time a dialog is opened.
     if (context.element()->hasTagName(dialogTag))
         return 0;
 
     // Cache whether context.element() is affected by any known class selectors.
     // FIXME: This should be an explicit out parameter, instead of a member variable.
     m_elementAffectedByClassRules = context.element() && context.element()->hasClass() && classNamesAffectedByRules(context.element()->classNames());
 
     // Check next siblings and their cousins.
     unsigned count = 0;
     unsigned visitedNodeCount = 0;
     Element* shareElement = 0;
-    Node* cousinList = context.styledElement()->nextSibling();
+    Node* cousinList = context.element()->nextSibling();
     while (cousinList) {
         shareElement = findSiblingForStyleSharing(context, cousinList, count);
         if (shareElement)
             break;
         cousinList = locateCousinList(cousinList->parentElement(), visitedNodeCount);
     }
 
     // If we have exhausted all our budget or our cousins.
     if (!shareElement)
         return 0;
@@ skipping 1595 matching lines @@
 void CachedMatchedProperties::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     info.addMember(matchedProperties, "matchedProperties");
     info.addMember(ranges, "ranges");
     info.addMember(renderStyle, "renderStyle");
     info.addMember(parentRenderStyle, "parentRenderStyle");
 }
 
 } // namespace WebCore