Changeset 202607 in webkit


Ignore:
Timestamp:
Jun 28, 2016 9:03:43 PM (8 years ago)
Author:
benjamin@webkit.org
Message:

Rename ChildrenAffectedByActive to StyleAffectedByActive
​https://bugs.webkit.org/show_bug.cgi?id=159187

Reviewed by Antti Koivisto.

Flags named "ChildrenAffectedBy" are used when the invalidation
of children is so crazy that we invalidate the whole parent subtree instead.

That's not the case for :active. It is a straightforward element invalidation.
Consequently, the property is renamed to StyleAffectedByActive.

  • dom/Element.cpp:

(WebCore::Element::setActive):
(WebCore::Element::setStyleAffectedByActive):
(WebCore::Element::hasFlagsSetDuringStylingOfChildren):
(WebCore::Element::rareDataStyleAffectedByActive):
(WebCore::Element::setChildrenAffectedByActive): Deleted.
(WebCore::Element::rareDataChildrenAffectedByActive): Deleted.

  • dom/Element.h:

(WebCore::Element::styleAffectedByActive):
(WebCore::Element::childrenAffectedByActive): Deleted.

  • dom/ElementRareData.h:

(WebCore::ElementRareData::styleAffectedByActive):
(WebCore::ElementRareData::setStyleAffectedByActive):
(WebCore::ElementRareData::ElementRareData):
(WebCore::ElementRareData::resetDynamicRestyleObservations):
(WebCore::ElementRareData::childrenAffectedByActive): Deleted.
(WebCore::ElementRareData::setChildrenAffectedByActive): Deleted.

  • style/StyleRelations.cpp:

(WebCore::Style::commitRelations):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r202599 r202607  
     12016-06-28  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Rename ChildrenAffectedByActive to StyleAffectedByActive
     4        https://bugs.webkit.org/show_bug.cgi?id=159187
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Flags named "ChildrenAffectedBy" are used when the invalidation
     9        of children is so crazy that we invalidate the whole parent subtree instead.
     10
     11        That's not the case for :active. It is a straightforward element invalidation.
     12        Consequently, the property is renamed to StyleAffectedByActive.
     13
     14        * dom/Element.cpp:
     15        (WebCore::Element::setActive):
     16        (WebCore::Element::setStyleAffectedByActive):
     17        (WebCore::Element::hasFlagsSetDuringStylingOfChildren):
     18        (WebCore::Element::rareDataStyleAffectedByActive):
     19        (WebCore::Element::setChildrenAffectedByActive): Deleted.
     20        (WebCore::Element::rareDataChildrenAffectedByActive): Deleted.
     21        * dom/Element.h:
     22        (WebCore::Element::styleAffectedByActive):
     23        (WebCore::Element::childrenAffectedByActive): Deleted.
     24        * dom/ElementRareData.h:
     25        (WebCore::ElementRareData::styleAffectedByActive):
     26        (WebCore::ElementRareData::setStyleAffectedByActive):
     27        (WebCore::ElementRareData::ElementRareData):
     28        (WebCore::ElementRareData::resetDynamicRestyleObservations):
     29        (WebCore::ElementRareData::childrenAffectedByActive): Deleted.
     30        (WebCore::ElementRareData::setChildrenAffectedByActive): Deleted.
     31        * style/StyleRelations.cpp:
     32        (WebCore::Style::commitRelations):
     33
    1342016-06-28  Jiewen Tan  <jiewen_tan@apple.com>
    235

  • trunk/Source/WebCore/dom/Element.cpp

    r202559 r202607  
    555555
    556556    const RenderStyle* renderStyle = this->renderStyle();
    557     bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || childrenAffectedByActive();
     557    bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || styleAffectedByActive();
    558558    if (reactsToPress)
    559559        setNeedsStyleRecalc();
    … …  
    25822582}
    25832583
    2584 void Element::setChildrenAffectedByActive()
    2585 {
    2586     ensureElementRareData().setChildrenAffectedByActive(true);
     2584void Element::setStyleAffectedByActive()
     2585{
     2586    ensureElementRareData().setStyleAffectedByActive(true);
    25872587}
    25882588
    … …  
    26152615    if (!hasRareData())
    26162616        return false;
    2617     return rareDataChildrenAffectedByActive()
     2617    return rareDataStyleAffectedByActive()
    26182618        || rareDataChildrenAffectedByDrag()
    26192619        || rareDataChildrenAffectedByBackwardPositionalRules()
    … …  
    26392639}
    26402640
    2641 bool Element::rareDataChildrenAffectedByActive() const
     2641bool Element::rareDataStyleAffectedByActive() const
    26422642{
    26432643    ASSERT(hasRareData());
    2644     return elementRareData()->childrenAffectedByActive();
     2644    return elementRareData()->styleAffectedByActive();
    26452645}
    26462646

  • trunk/Source/WebCore/dom/Element.h

    r202358 r202607  
    298298
    299299    // Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
     300    bool styleAffectedByActive() const { return hasRareData() && rareDataStyleAffectedByActive(); }
    300301    bool styleAffectedByEmpty() const { return hasRareData() && rareDataStyleAffectedByEmpty(); }
    301302    bool styleAffectedByFocusWithin() const { return hasRareData() && rareDataStyleAffectedByFocusWithin(); }
    302303    bool childrenAffectedByHover() const { return getFlag(ChildrenAffectedByHoverRulesFlag); }
    303     bool childrenAffectedByActive() const { return hasRareData() && rareDataChildrenAffectedByActive(); }
    304304    bool childrenAffectedByDrag() const { return hasRareData() && rareDataChildrenAffectedByDrag(); }
    305305    bool childrenAffectedByFirstChildRules() const { return getFlag(ChildrenAffectedByFirstChildRulesFlag); }
    … …  
    315315    void setStyleAffectedByFocusWithin();
    316316    void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }
    317     void setChildrenAffectedByActive();
     317    void setStyleAffectedByActive();
    318318    void setChildrenAffectedByDrag();
    319319    void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }
    … …  
    619619    bool rareDataIsNamedFlowContentElement() const;
    620620    bool rareDataChildrenAffectedByHover() const;
    621     bool rareDataChildrenAffectedByActive() const;
     621    bool rareDataStyleAffectedByActive() const;
    622622    bool rareDataChildrenAffectedByDrag() const;
    623623    bool rareDataChildrenAffectedByLastChildRules() const;

  • trunk/Source/WebCore/dom/ElementRareData.h

    r202358 r202607  
    5656    void setNeedsFocusAppearanceUpdateSoonAfterAttach(bool needs) { m_needsFocusAppearanceUpdateSoonAfterAttach = needs; }
    5757
     58    bool styleAffectedByActive() const { return m_styleAffectedByActive; }
     59    void setStyleAffectedByActive(bool value) { m_styleAffectedByActive = value; }
     60
    5861    bool styleAffectedByEmpty() const { return m_styleAffectedByEmpty; }
    5962    void setStyleAffectedByEmpty(bool value) { m_styleAffectedByEmpty = value; }
    … …  
    7376#endif
    7477
    75     bool childrenAffectedByActive() const { return m_childrenAffectedByActive; }
    76     void setChildrenAffectedByActive(bool value) { m_childrenAffectedByActive = value; }
    7778    bool childrenAffectedByDrag() const { return m_childrenAffectedByDrag; }
    7879    void setChildrenAffectedByDrag(bool value) { m_childrenAffectedByDrag = value; }
    … …  
    122123    unsigned m_tabIndexWasSetExplicitly : 1;
    123124    unsigned m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
     125    unsigned m_styleAffectedByActive : 1;
    124126    unsigned m_styleAffectedByEmpty : 1;
    125127    unsigned m_styleAffectedByFocusWithin : 1;
    … …  
    129131    unsigned m_hasPendingResources : 1;
    130132    unsigned m_childrenAffectedByHover : 1;
    131     unsigned m_childrenAffectedByActive : 1;
    132133    unsigned m_childrenAffectedByDrag : 1;
    133134    // Bits for dynamic child matching.
    … …  
    168169    , m_tabIndexWasSetExplicitly(false)
    169170    , m_needsFocusAppearanceUpdateSoonAfterAttach(false)
     171    , m_styleAffectedByActive(false)
    170172    , m_styleAffectedByEmpty(false)
    171173    , m_styleAffectedByFocusWithin(false)
    … …  
    175177    , m_hasPendingResources(false)
    176178    , m_childrenAffectedByHover(false)
    177     , m_childrenAffectedByActive(false)
    178179    , m_childrenAffectedByDrag(false)
    179180    , m_childrenAffectedByLastChildRules(false)
    … …  
    217218inline void ElementRareData::resetDynamicRestyleObservations()
    218219{
    219     setChildrenAffectedByActive(false);
     220    setStyleAffectedByActive(false);
    220221    setChildrenAffectedByDrag(false);
    221222    setChildrenAffectedByLastChildRules(false);

  • trunk/Source/WebCore/style/StyleRelations.cpp

    r202517 r202607  
    9797        switch (relation.type) {
    9898        case Relation::AffectedByActive:
    99             element.setChildrenAffectedByActive();
     99            element.setStyleAffectedByActive();
    100100            break;
    101101        case Relation::AffectedByDrag:
Note: See TracChangeset for help on using the changeset viewer.