<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202607] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202607">202607</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-28 21:03:43 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatah">trunk/Source/WebCore/dom/ElementRareData.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleRelationscpp">trunk/Source/WebCore/style/StyleRelations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202606 => 202607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-06-28 Benjamin Poulain <benjamin@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):
+
</ins><span class="cx"> 2016-06-28 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement "replacement" codec
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (202606 => 202607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> document().userActionElements().setActive(this, flag);
</span><span class="cx">
</span><span class="cx"> const RenderStyle* renderStyle = this->renderStyle();
</span><del>- bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || childrenAffectedByActive();
</del><ins>+ bool reactsToPress = (renderStyle && renderStyle->affectedByActive()) || styleAffectedByActive();
</ins><span class="cx"> if (reactsToPress)
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx">
</span><span class="lines">@@ -2581,9 +2581,9 @@
</span><span class="cx"> ensureElementRareData().setStyleAffectedByFocusWithin(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setChildrenAffectedByActive()
</del><ins>+void Element::setStyleAffectedByActive()
</ins><span class="cx"> {
</span><del>- ensureElementRareData().setChildrenAffectedByActive(true);
</del><ins>+ ensureElementRareData().setStyleAffectedByActive(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::setChildrenAffectedByDrag()
</span><span class="lines">@@ -2614,7 +2614,7 @@
</span><span class="cx">
</span><span class="cx"> if (!hasRareData())
</span><span class="cx"> return false;
</span><del>- return rareDataChildrenAffectedByActive()
</del><ins>+ return rareDataStyleAffectedByActive()
</ins><span class="cx"> || rareDataChildrenAffectedByDrag()
</span><span class="cx"> || rareDataChildrenAffectedByBackwardPositionalRules()
</span><span class="cx"> || rareDataChildrenAffectedByPropertyBasedBackwardPositionalRules();
</span><span class="lines">@@ -2638,10 +2638,10 @@
</span><span class="cx"> return elementRareData()->isNamedFlowContentElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Element::rareDataChildrenAffectedByActive() const
</del><ins>+bool Element::rareDataStyleAffectedByActive() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasRareData());
</span><del>- return elementRareData()->childrenAffectedByActive();
</del><ins>+ return elementRareData()->styleAffectedByActive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Element::rareDataChildrenAffectedByDrag() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (202606 => 202607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -297,10 +297,10 @@
</span><span class="cx"> bool needsStyleInvalidation() const;
</span><span class="cx">
</span><span class="cx"> // Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
</span><ins>+ bool styleAffectedByActive() const { return hasRareData() && rareDataStyleAffectedByActive(); }
</ins><span class="cx"> bool styleAffectedByEmpty() const { return hasRareData() && rareDataStyleAffectedByEmpty(); }
</span><span class="cx"> bool styleAffectedByFocusWithin() const { return hasRareData() && rareDataStyleAffectedByFocusWithin(); }
</span><span class="cx"> bool childrenAffectedByHover() const { return getFlag(ChildrenAffectedByHoverRulesFlag); }
</span><del>- bool childrenAffectedByActive() const { return hasRareData() && rareDataChildrenAffectedByActive(); }
</del><span class="cx"> bool childrenAffectedByDrag() const { return hasRareData() && rareDataChildrenAffectedByDrag(); }
</span><span class="cx"> bool childrenAffectedByFirstChildRules() const { return getFlag(ChildrenAffectedByFirstChildRulesFlag); }
</span><span class="cx"> bool childrenAffectedByLastChildRules() const { return getFlag(ChildrenAffectedByLastChildRulesFlag); }
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> void setStyleAffectedByEmpty();
</span><span class="cx"> void setStyleAffectedByFocusWithin();
</span><span class="cx"> void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }
</span><del>- void setChildrenAffectedByActive();
</del><ins>+ void setStyleAffectedByActive();
</ins><span class="cx"> void setChildrenAffectedByDrag();
</span><span class="cx"> void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }
</span><span class="cx"> void setChildrenAffectedByLastChildRules() { setFlag(ChildrenAffectedByLastChildRulesFlag); }
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> bool rareDataStyleAffectedByFocusWithin() const;
</span><span class="cx"> bool rareDataIsNamedFlowContentElement() const;
</span><span class="cx"> bool rareDataChildrenAffectedByHover() const;
</span><del>- bool rareDataChildrenAffectedByActive() const;
</del><ins>+ bool rareDataStyleAffectedByActive() const;
</ins><span class="cx"> bool rareDataChildrenAffectedByDrag() const;
</span><span class="cx"> bool rareDataChildrenAffectedByLastChildRules() const;
</span><span class="cx"> bool rareDataChildrenAffectedByBackwardPositionalRules() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (202606 => 202607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -55,6 +55,9 @@
</span><span class="cx"> bool needsFocusAppearanceUpdateSoonAfterAttach() const { return m_needsFocusAppearanceUpdateSoonAfterAttach; }
</span><span class="cx"> void setNeedsFocusAppearanceUpdateSoonAfterAttach(bool needs) { m_needsFocusAppearanceUpdateSoonAfterAttach = needs; }
</span><span class="cx">
</span><ins>+ bool styleAffectedByActive() const { return m_styleAffectedByActive; }
+ void setStyleAffectedByActive(bool value) { m_styleAffectedByActive = value; }
+
</ins><span class="cx"> bool styleAffectedByEmpty() const { return m_styleAffectedByEmpty; }
</span><span class="cx"> void setStyleAffectedByEmpty(bool value) { m_styleAffectedByEmpty = value; }
</span><span class="cx">
</span><span class="lines">@@ -72,8 +75,6 @@
</span><span class="cx"> void setContainsFullScreenElement(bool value) { m_containsFullScreenElement = value; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool childrenAffectedByActive() const { return m_childrenAffectedByActive; }
- void setChildrenAffectedByActive(bool value) { m_childrenAffectedByActive = value; }
</del><span class="cx"> bool childrenAffectedByDrag() const { return m_childrenAffectedByDrag; }
</span><span class="cx"> void setChildrenAffectedByDrag(bool value) { m_childrenAffectedByDrag = value; }
</span><span class="cx">
</span><span class="lines">@@ -121,6 +122,7 @@
</span><span class="cx"> unsigned short m_childIndex;
</span><span class="cx"> unsigned m_tabIndexWasSetExplicitly : 1;
</span><span class="cx"> unsigned m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
</span><ins>+ unsigned m_styleAffectedByActive : 1;
</ins><span class="cx"> unsigned m_styleAffectedByEmpty : 1;
</span><span class="cx"> unsigned m_styleAffectedByFocusWithin : 1;
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -128,7 +130,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> unsigned m_hasPendingResources : 1;
</span><span class="cx"> unsigned m_childrenAffectedByHover : 1;
</span><del>- unsigned m_childrenAffectedByActive : 1;
</del><span class="cx"> unsigned m_childrenAffectedByDrag : 1;
</span><span class="cx"> // Bits for dynamic child matching.
</span><span class="cx"> // We optimize for :first-child and :last-child. The other positional child selectors like nth-child or
</span><span class="lines">@@ -167,6 +168,7 @@
</span><span class="cx"> , m_childIndex(0)
</span><span class="cx"> , m_tabIndexWasSetExplicitly(false)
</span><span class="cx"> , m_needsFocusAppearanceUpdateSoonAfterAttach(false)
</span><ins>+ , m_styleAffectedByActive(false)
</ins><span class="cx"> , m_styleAffectedByEmpty(false)
</span><span class="cx"> , m_styleAffectedByFocusWithin(false)
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -174,7 +176,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_hasPendingResources(false)
</span><span class="cx"> , m_childrenAffectedByHover(false)
</span><del>- , m_childrenAffectedByActive(false)
</del><span class="cx"> , m_childrenAffectedByDrag(false)
</span><span class="cx"> , m_childrenAffectedByLastChildRules(false)
</span><span class="cx"> , m_childrenAffectedByBackwardPositionalRules(false)
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx">
</span><span class="cx"> inline void ElementRareData::resetDynamicRestyleObservations()
</span><span class="cx"> {
</span><del>- setChildrenAffectedByActive(false);
</del><ins>+ setStyleAffectedByActive(false);
</ins><span class="cx"> setChildrenAffectedByDrag(false);
</span><span class="cx"> setChildrenAffectedByLastChildRules(false);
</span><span class="cx"> setChildrenAffectedByBackwardPositionalRules(false);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleRelationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleRelations.cpp (202606 => 202607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> auto& element = const_cast<Element&>(*relation.element);
</span><span class="cx"> switch (relation.type) {
</span><span class="cx"> case Relation::AffectedByActive:
</span><del>- element.setChildrenAffectedByActive();
</del><ins>+ element.setStyleAffectedByActive();
</ins><span class="cx"> break;
</span><span class="cx"> case Relation::AffectedByDrag:
</span><span class="cx"> element.setChildrenAffectedByDrag();
</span></span></pre>
</div>
</div>
</body>
</html>