- Revision
- 202607
- Author
- benja...@webkit.org
- Date
- 2016-06-28 21:03:43 -0700 (Tue, 28 Jun 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202606 => 202607)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 03:56:18 UTC (rev 202606)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 04:03:43 UTC (rev 202607)
@@ -1,3 +1,36 @@
+2016-06-28 Benjamin Poulain <benja...@webkit.org>
+
+ 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):
+
2016-06-28 Jiewen Tan <jiewen_...@apple.com>
Implement "replacement" codec
Modified: trunk/Source/WebCore/dom/Element.cpp (202606 => 202607)
--- trunk/Source/WebCore/dom/Element.cpp 2016-06-29 03:56:18 UTC (rev 202606)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-06-29 04:03:43 UTC (rev 202607)
@@ -554,7 +554,7 @@
document().userActionElements().setActive(this, flag);
const RenderStyle* renderStyle = this->renderStyle();
- bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || childrenAffectedByActive();
+ bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || styleAffectedByActive();
if (reactsToPress)
setNeedsStyleRecalc();
@@ -2581,9 +2581,9 @@
ensureElementRareData().setStyleAffectedByFocusWithin(true);
}
-void Element::setChildrenAffectedByActive()
+void Element::setStyleAffectedByActive()
{
- ensureElementRareData().setChildrenAffectedByActive(true);
+ ensureElementRareData().setStyleAffectedByActive(true);
}
void Element::setChildrenAffectedByDrag()
@@ -2614,7 +2614,7 @@
if (!hasRareData())
return false;
- return rareDataChildrenAffectedByActive()
+ return rareDataStyleAffectedByActive()
|| rareDataChildrenAffectedByDrag()
|| rareDataChildrenAffectedByBackwardPositionalRules()
|| rareDataChildrenAffectedByPropertyBasedBackwardPositionalRules();
@@ -2638,10 +2638,10 @@
return elementRareData()->isNamedFlowContentElement();
}
-bool Element::rareDataChildrenAffectedByActive() const
+bool Element::rareDataStyleAffectedByActive() const
{
ASSERT(hasRareData());
- return elementRareData()->childrenAffectedByActive();
+ return elementRareData()->styleAffectedByActive();
}
bool Element::rareDataChildrenAffectedByDrag() const
Modified: trunk/Source/WebCore/dom/Element.h (202606 => 202607)
--- trunk/Source/WebCore/dom/Element.h 2016-06-29 03:56:18 UTC (rev 202606)
+++ trunk/Source/WebCore/dom/Element.h 2016-06-29 04:03:43 UTC (rev 202607)
@@ -297,10 +297,10 @@
bool needsStyleInvalidation() const;
// Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
+ bool styleAffectedByActive() const { return hasRareData() && rareDataStyleAffectedByActive(); }
bool styleAffectedByEmpty() const { return hasRareData() && rareDataStyleAffectedByEmpty(); }
bool styleAffectedByFocusWithin() const { return hasRareData() && rareDataStyleAffectedByFocusWithin(); }
bool childrenAffectedByHover() const { return getFlag(ChildrenAffectedByHoverRulesFlag); }
- bool childrenAffectedByActive() const { return hasRareData() && rareDataChildrenAffectedByActive(); }
bool childrenAffectedByDrag() const { return hasRareData() && rareDataChildrenAffectedByDrag(); }
bool childrenAffectedByFirstChildRules() const { return getFlag(ChildrenAffectedByFirstChildRulesFlag); }
bool childrenAffectedByLastChildRules() const { return getFlag(ChildrenAffectedByLastChildRulesFlag); }
@@ -314,7 +314,7 @@
void setStyleAffectedByEmpty();
void setStyleAffectedByFocusWithin();
void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }
- void setChildrenAffectedByActive();
+ void setStyleAffectedByActive();
void setChildrenAffectedByDrag();
void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }
void setChildrenAffectedByLastChildRules() { setFlag(ChildrenAffectedByLastChildRulesFlag); }
@@ -618,7 +618,7 @@
bool rareDataStyleAffectedByFocusWithin() const;
bool rareDataIsNamedFlowContentElement() const;
bool rareDataChildrenAffectedByHover() const;
- bool rareDataChildrenAffectedByActive() const;
+ bool rareDataStyleAffectedByActive() const;
bool rareDataChildrenAffectedByDrag() const;
bool rareDataChildrenAffectedByLastChildRules() const;
bool rareDataChildrenAffectedByBackwardPositionalRules() const;
Modified: trunk/Source/WebCore/dom/ElementRareData.h (202606 => 202607)
--- trunk/Source/WebCore/dom/ElementRareData.h 2016-06-29 03:56:18 UTC (rev 202606)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2016-06-29 04:03:43 UTC (rev 202607)
@@ -55,6 +55,9 @@
bool needsFocusAppearanceUpdateSoonAfterAttach() const { return m_needsFocusAppearanceUpdateSoonAfterAttach; }
void setNeedsFocusAppearanceUpdateSoonAfterAttach(bool needs) { m_needsFocusAppearanceUpdateSoonAfterAttach = needs; }
+ bool styleAffectedByActive() const { return m_styleAffectedByActive; }
+ void setStyleAffectedByActive(bool value) { m_styleAffectedByActive = value; }
+
bool styleAffectedByEmpty() const { return m_styleAffectedByEmpty; }
void setStyleAffectedByEmpty(bool value) { m_styleAffectedByEmpty = value; }
@@ -72,8 +75,6 @@
void setContainsFullScreenElement(bool value) { m_containsFullScreenElement = value; }
#endif
- bool childrenAffectedByActive() const { return m_childrenAffectedByActive; }
- void setChildrenAffectedByActive(bool value) { m_childrenAffectedByActive = value; }
bool childrenAffectedByDrag() const { return m_childrenAffectedByDrag; }
void setChildrenAffectedByDrag(bool value) { m_childrenAffectedByDrag = value; }
@@ -121,6 +122,7 @@
unsigned short m_childIndex;
unsigned m_tabIndexWasSetExplicitly : 1;
unsigned m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
+ unsigned m_styleAffectedByActive : 1;
unsigned m_styleAffectedByEmpty : 1;
unsigned m_styleAffectedByFocusWithin : 1;
#if ENABLE(FULLSCREEN_API)
@@ -128,7 +130,6 @@
#endif
unsigned m_hasPendingResources : 1;
unsigned m_childrenAffectedByHover : 1;
- unsigned m_childrenAffectedByActive : 1;
unsigned m_childrenAffectedByDrag : 1;
// Bits for dynamic child matching.
// We optimize for :first-child and :last-child. The other positional child selectors like nth-child or
@@ -167,6 +168,7 @@
, m_childIndex(0)
, m_tabIndexWasSetExplicitly(false)
, m_needsFocusAppearanceUpdateSoonAfterAttach(false)
+ , m_styleAffectedByActive(false)
, m_styleAffectedByEmpty(false)
, m_styleAffectedByFocusWithin(false)
#if ENABLE(FULLSCREEN_API)
@@ -174,7 +176,6 @@
#endif
, m_hasPendingResources(false)
, m_childrenAffectedByHover(false)
- , m_childrenAffectedByActive(false)
, m_childrenAffectedByDrag(false)
, m_childrenAffectedByLastChildRules(false)
, m_childrenAffectedByBackwardPositionalRules(false)
@@ -216,7 +217,7 @@
inline void ElementRareData::resetDynamicRestyleObservations()
{
- setChildrenAffectedByActive(false);
+ setStyleAffectedByActive(false);
setChildrenAffectedByDrag(false);
setChildrenAffectedByLastChildRules(false);
setChildrenAffectedByBackwardPositionalRules(false);
Modified: trunk/Source/WebCore/style/StyleRelations.cpp (202606 => 202607)
--- trunk/Source/WebCore/style/StyleRelations.cpp 2016-06-29 03:56:18 UTC (rev 202606)
+++ trunk/Source/WebCore/style/StyleRelations.cpp 2016-06-29 04:03:43 UTC (rev 202607)
@@ -96,7 +96,7 @@
auto& element = const_cast<Element&>(*relation.element);
switch (relation.type) {
case Relation::AffectedByActive:
- element.setChildrenAffectedByActive();
+ element.setStyleAffectedByActive();
break;
case Relation::AffectedByDrag:
element.setChildrenAffectedByDrag();
