Changeset 155931 in webkit for trunk/Source/WebCore/css/StyleResolver.cpp

Timestamp:

Sep 17, 2013, 1:13:32 AM (12 years ago)

Author:

[email protected]

Message:

Move <style scoped> code behind ENABLE(STYLE_SCOPED)
<​https://webkit.org/b/121018>

Reviewed by Darin Adler.

Move all the code for <style scoped> behind ENABLE(STYLE_SCOPED) guards.
It's not nice to clutter common codepaths with code that always executes
even though the feature is disabled at compile-time.

File:

• trunk/Source/WebCore/css/StyleResolver.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -464 +464 @@
     if (!parent || !parent->isStyledElement())
         return 0;
+#if ENABLE(STYLE_SCOPED)
     if (parent->hasScopedHTMLStyleChild())
         return 0;
+#endif
     StyledElement* p = static_cast<StyledElement*>(parent);
     if (p->inlineStyle())
@@ -655 +657 @@
     if (element->hasID() && m_ruleSets.features().idsInRules.contains(element->idForStyleResolution().impl()))
         return false;
+#if ENABLE(STYLE_SCOPED)
     if (element->hasScopedHTMLStyleChild())
         return false;
+#endif
 
     // FIXME: We should share style for option and optgroup whenever possible.
@@ -740 +744 @@
     if (parentElementPreventsSharing(state.element()->parentElement()))
         return 0;
+#if ENABLE(STYLE_SCOPED)
     if (state.styledElement()->hasScopedHTMLStyleChild())
         return 0;
+#endif
     if (state.element() == state.document().cssTarget())
         return 0;