ChangeLog

112012-03-30 Eric Seidel <eric@webkit.org>

22

        styleForElement() should use enums instead of bools so we can all understand what it's doing

        https://bugs.webkit.org/show_bug.cgi?id=82807

        Reviewed by NOBODY (OOPS!).

        No change in behavior, thus no tests.

        Mostly this is just replacing true/false with the correct new enum value

        or removing true/false from the callsites when they would have been default anyway.

        I think this makes the code *way* more clear.

        The old code was extra confusing because the defaults were "true, false". :)

        The new defaults are AllowStyleSharing, MatchAllRules.

        It's very uncommon for callers to want to override either of these behaviors.

        I think most callers which specify DisallowStyleSharing likely don't actually need to

        (our style-sharing code should be smart enough to only share when safe anyway).

        * css/CSSStyleSelector.cpp:

        (WebCore::CSSStyleSelector::CSSStyleSelector):

         - Use enums and remove bogus comment (m_rootDefaultStyle is a RefPtr!)

        (WebCore::CSSStyleSelector::collectMatchingRulesForList):

        * css/CSSStyleSelector.h:

        (CSSStyleSelector):

        * css/MediaQueryMatcher.cpp:

        (WebCore::MediaQueryMatcher::prepareEvaluator):

        * css/StyleMedia.cpp:

        (WebCore::StyleMedia::matchMedium):

        * dom/Element.cpp:

        (WebCore::Element::styleForRenderer):

        * rendering/RenderObject.cpp:

        (WebCore::RenderObject::getUncachedPseudoStyle):

         - Updated to use enums

         - Also fixed this to use toElement and modern early-return styles.

        * rendering/RenderRegion.cpp:

        (WebCore::RenderRegion::computeStyleInRegion):

        * svg/SVGElement.cpp:

        (WebCore::SVGElement::customStyleForRenderer):

2012-03-30  Eric Seidel  <eric@webkit.org>

        Add tests for iframe seamless and support for parsing webkitseamless attribute

        https://bugs.webkit.org/show_bug.cgi?id=82795

Source/WebCore/css/CSSStyleSelector.cpp

@@CSSStyleSelector::CSSStyleSelector(Document* document, bool matchAuthorAndUserSt

        m_medium = adoptPtr(new MediaQueryEvaluator("all"));

    if (root)

378 m_rootDefaultStyle = styleForElement(root, 0, f~~alse, true); // don't ref, because the Render~~Style ~~is alloc~~at~~ed from~~ g~~lobal heap~~

378 m_rootDefaultStyle = styleForElement(root, 0, DisallowStyleSharing, MatchOnlyUserAgentRules);

    if (m_rootDefaultStyle && view)

        m_medium = adoptPtr(new MediaQueryEvaluator(view->mediaType(), view->frame(), m_rootDefaultStyle.get()));

@@static inline bool isAtShadowBoundary(Element* element)

    return parentNode && parentNode->isShadowRoot();

}

// If resolveForRootDefault is true, style based on user agent style sheet only. This is used in media queries, where

// relative units are interpreted according to document root element style, styled only with UA stylesheet

PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault, RenderRegion* regionForStyling)

1570PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent,

1571 StyleSharingBehavior sharingBehavior, RuleMatchingBehavior matchingBehavior, RenderRegion* regionForStyling)

{

    // Once an element has a renderer, we don't try to destroy it, since otherwise the renderer

    // will vanish if a style recalc happens during loading.

1577 if (allowSharing && !element->document()->haveStylesheetsLoaded() && !element->renderer()) {

1575 if (sharingBehavior == AllowStyleSharing && !element->document()->haveStylesheetsLoaded() && !element->renderer()) {

        if (!s_styleNotYetAvailable) {

            s_styleNotYetAvailable = RenderStyle::create().leakRef();

            s_styleNotYetAvailable->setDisplay(NONE);

@@PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, Rend

    initElement(element);

    initForStyleResolve(element, defaultParent);

    m_regionForStyling = regionForStyling;

1590 if (allowSharing) {

1588 if (sharingBehavior == AllowStyleSharing) {

        RenderStyle* sharedStyle = locateSharedStyle();

        if (sharedStyle)

            return sharedStyle;

@@PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, Rend

    ensureDefaultStyleSheetsForElement(element);

    MatchResult matchResult;

1618 if (r~~esolveForRootDefault~~)

1616 if (matchingBehavior == MatchOnlyUserAgentRules)

        matchUARules(matchResult);

    else

        matchAllRules(matchResult);

Source/WebCore/css/CSSStyleSelector.h

@@public:

    bool m_result;

};

enum StyleSharingBehavior {

    AllowStyleSharing,

    DisallowStyleSharing,

};

// MatchOnlyUserAgentRules is used in media queries, where relative units

// are interpreted according to the document root element style, and styled only

// from the User Agent Stylesheet rules.

enum RuleMatchingBehavior {

    MatchAllRules,

    MatchOnlyUserAgentRules,

};

// This class selects a RenderStyle for a given element based on a collection of stylesheets.

class CSSStyleSelector {

    WTF_MAKE_NONCOPYABLE(CSSStyleSelector); WTF_MAKE_FAST_ALLOCATED;

@@public:

    void pushParentShadowRoot(const ShadowRoot*);

    void popParentShadowRoot(const ShadowRoot*);

116 PassRefPtr<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, bool allowSharing = true, bool resolveForRootDefault = false, RenderRegion* regionForStyling = 0);

130 PassRefPtr<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,

131 RuleMatchingBehavior = MatchAllRules, RenderRegion* regionForStyling = 0);

    void keyframeStylesForAnimation(Element*, const RenderStyle*, KeyframeList&);

Source/WebCore/css/MediaQueryMatcher.cpp

@@PassOwnPtr<MediaQueryEvaluator> MediaQueryMatcher::prepareEvaluator() const

    if (!styleSelector)

        return nullptr;

91 RefPtr<RenderStyle> rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, ~~fal~~se /*allowSharing*/, tr~~ue /*resolveForRootDefault*/~~);

91 RefPtr<RenderStyle> rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules);

    return adoptPtr(new MediaQueryEvaluator(mediaType(), m_document->frame(), rootStyle.get()));

}

Source/WebCore/css/StyleMedia.cpp

@@bool StyleMedia::matchMedium(const String& query) const

    if (!styleSelector)

        return false;

67 RefPtr<RenderStyle> rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, ~~fal~~se /*allowSharing*/, tr~~ue /*resolveForRootDefault*/~~);

67 RefPtr<RenderStyle> rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, DisallowStyleSharing, MatchOnlyUserAgentRules);

    RefPtr<MediaQuerySet> media = MediaQuerySet::create();

    if (!media->parse(query))

Source/WebCore/dom/Element.cpp

@@PassRefPtr<RenderStyle> Element::styleForRenderer()

{

    if (hasCustomStyleForRenderer())

        return customStyleForRenderer();

1041 return document()->styleSelector()->styleForElement(static_cast<Element*>(this)~~, 0, true/*allowSharing*/~~);

1041 return document()->styleSelector()->styleForElement(static_cast<Element*>(this));

}

void Element::recalcStyle(StyleChange change)

Source/WebCore/rendering/RenderObject.cpp

@@PassRefPtr<RenderStyle> RenderObject::getUncachedPseudoStyle(PseudoId pseudo, Re

        parentStyle = style();

    }

2548 /// FIXME: This "find nearest element parent" should be a helper function.

    Node* n = node();

    while (n && !n->isElementNode())

        n = n->parentNode();

    if (!n)

        return 0;

2554 Element* element = toElement(n);

25532555

2554 RefPtr<RenderStyle> result;

25552556 if (pseudo == FIRST_LINE_INHERITED) {

2556 result = document()->styleSelector()->styleForElement(~~static_cast<E~~lement*>(n), parentStyle, f~~als~~e);

2557 RefPtr<RenderStyle> result = document()->styleSelector()->styleForElement(element, parentStyle, DisallowStyleSharing);

25572558 result->setStyleType(FIRST_LINE_INHERITED);

    } else

        result = document()->styleSelector()->pseudoStyleForElement(pseudo, static_cast<Element*>(n), parentStyle);

    return result.release();

        return result.release();

    }

    return document()->styleSelector()->pseudoStyleForElement(pseudo, element, parentStyle);

}

static Color decorationColor(RenderObject* renderer)

Source/WebCore/rendering/RenderRegion.cpp

@@PassRefPtr<RenderStyle> RenderRegion::computeStyleInRegion(const RenderBox* box)

    ASSERT(box->node() && box->node()->isElementNode());

    Element* element = toElement(box->node());

303 RefPtr<RenderStyle> renderBoxRegionStyle = box->view()->document()->styleSelector()->styleForElement(element, 0, f~~als~~e~~, f~~alse, this);

303 RefPtr<RenderStyle> renderBoxRegionStyle = box->view()->document()->styleSelector()->styleForElement(element, 0, DisallowStyleSharing, MatchAllRules, this);

    m_renderBoxRegionStyle.add(box, renderBoxRegionStyle);

    if (!box->hasBoxDecorations()) {

Source/WebCore/svg/SVGElement.cpp

@@void SVGElement::synchronizeSystemLanguage(void* contextElement)

PassRefPtr<RenderStyle> SVGElement::customStyleForRenderer()

{

    if (!correspondingElement())

481 return document()->styleSelector()->styleForElement(~~static_cast<Element*>(~~this)~~, 0, true)~~;

481 return document()->styleSelector()->styleForElement(this);

    RenderStyle* style = 0;

    if (Element* parent = parentOrHostElement()) {

@@PassRefPtr<RenderStyle> SVGElement::customStyleForRenderer()

            style = renderer->style();

    }

489 return document()->styleSelector()->styleForElement(correspondingElement(), style, ~~fal~~se /*allowSharing*/);

489 return document()->styleSelector()->styleForElement(correspondingElement(), style, DisallowStyleSharing);

}

StylePropertySet* SVGElement::animatedSMILStyleProperties() const