<!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>[175212] 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/175212">175212</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-26 21:20:25 -0700 (Sun, 26 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace Element::didAffectSelector() by setNeedsStyleRecalc()
https://bugs.webkit.org/show_bug.cgi?id=138080
Reviewed by Andreas Kling.
Element::didAffectSelector() was probably an optimization at some point,
with the current code is does nothing more than setNeedsStyleRecalc().
* dom/Document.cpp:
(WebCore::Document::setCSSTarget):
* dom/Element.cpp:
(WebCore::Element::didAffectSelector): Deleted.
* dom/Element.h:
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::parseAttribute):
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::disabledStateChanged):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setChecked):
(WebCore::HTMLInputElement::setIndeterminate):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::parseAttribute):
* html/HTMLOptGroupElement.cpp:
(WebCore::HTMLOptGroupElement::parseAttribute):
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::parseAttribute):
(WebCore::HTMLOptionElement::setSelectedState):
* html/HTMLProgressElement.cpp:
(WebCore::HTMLProgressElement::didElementStateChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptGroupElementcpp">trunk/Source/WebCore/html/HTMLOptGroupElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLProgressElementcpp">trunk/Source/WebCore/html/HTMLProgressElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/ChangeLog 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-10-26 Benjamin Poulain <benjamin@webkit.org>
+
+ Replace Element::didAffectSelector() by setNeedsStyleRecalc()
+ https://bugs.webkit.org/show_bug.cgi?id=138080
+
+ Reviewed by Andreas Kling.
+
+ Element::didAffectSelector() was probably an optimization at some point,
+ with the current code is does nothing more than setNeedsStyleRecalc().
+
+ * dom/Document.cpp:
+ (WebCore::Document::setCSSTarget):
+ * dom/Element.cpp:
+ (WebCore::Element::didAffectSelector): Deleted.
+ * dom/Element.h:
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::parseAttribute):
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::disabledStateChanged):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setChecked):
+ (WebCore::HTMLInputElement::setIndeterminate):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::parseAttribute):
+ * html/HTMLOptGroupElement.cpp:
+ (WebCore::HTMLOptGroupElement::parseAttribute):
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::parseAttribute):
+ (WebCore::HTMLOptionElement::setSelectedState):
+ * html/HTMLProgressElement.cpp:
+ (WebCore::HTMLProgressElement::didElementStateChange):
+
</ins><span class="cx"> 2014-10-26 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Move some RenderObject member functions to RenderElement.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -3557,10 +3557,10 @@
</span><span class="cx"> void Document::setCSSTarget(Element* n)
</span><span class="cx"> {
</span><span class="cx"> if (m_cssTarget)
</span><del>- m_cssTarget->didAffectSelector(AffectedSelectorTarget);
</del><ins>+ m_cssTarget->setNeedsStyleRecalc();
</ins><span class="cx"> m_cssTarget = n;
</span><span class="cx"> if (n)
</span><del>- n->didAffectSelector(AffectedSelectorTarget);
</del><ins>+ n->setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::registerNodeListForInvalidation(LiveNodeList& list)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -1424,11 +1424,6 @@
</span><span class="cx"> return hasRareData() ? elementRareData()->shadowRoot() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::didAffectSelector(AffectedSelectorMask)
-{
- setNeedsStyleRecalc();
-}
-
</del><span class="cx"> static bool shouldUseNodeRenderingTraversalSlowPath(const Element& element)
</span><span class="cx"> {
</span><span class="cx"> if (element.isShadowRoot())
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/dom/Element.h 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -51,17 +51,6 @@
</span><span class="cx"> class RenderNamedFlowFragment;
</span><span class="cx"> class ShadowRoot;
</span><span class="cx">
</span><del>-enum AffectedSelectorType {
- AffectedSelectorChecked = 1,
- AffectedSelectorEnabled = 1 << 1,
- AffectedSelectorDisabled = 1 << 2,
- AffectedSelectorIndeterminate = 1 << 3,
- AffectedSelectorLink = 1 << 4,
- AffectedSelectorTarget = 1 << 5,
- AffectedSelectorVisited = 1 << 6
-};
-typedef int AffectedSelectorMask;
-
</del><span class="cx"> enum SpellcheckAttributeState {
</span><span class="cx"> SpellcheckAttributeTrue,
</span><span class="cx"> SpellcheckAttributeFalse,
</span><span class="lines">@@ -322,7 +311,6 @@
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>);
</span><span class="cx"> virtual bool rendererIsNeeded(const RenderStyle&);
</span><del>- void didAffectSelector(AffectedSelectorMask);
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ShadowRoot* shadowRoot() const;
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<ShadowRoot> createShadowRoot(ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> bool wasLink = isLink();
</span><span class="cx"> setIsLink(!value.isNull() && !shouldProhibitLinks(this));
</span><span class="cx"> if (wasLink != isLink())
</span><del>- didAffectSelector(AffectedSelectorLink | AffectedSelectorVisited);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> if (isLink()) {
</span><span class="cx"> String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
</span><span class="cx"> if (document().isDNSPrefetchEnabled()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> void HTMLFormControlElement::disabledStateChanged()
</span><span class="cx"> {
</span><span class="cx"> setNeedsWillValidateCheck();
</span><del>- didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><span class="cx"> renderer()->theme().stateChanged(*renderer(), ControlStates::EnabledState);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> dispatchFormControlChangeEvent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- didAffectSelector(AffectedSelectorChecked);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::setIndeterminate(bool newValue)
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx">
</span><span class="cx"> m_isIndeterminate = newValue;
</span><span class="cx">
</span><del>- didAffectSelector(AffectedSelectorIndeterminate);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx">
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><span class="cx"> renderer()->theme().stateChanged(*renderer(), ControlStates::CheckedState);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> bool wasLink = isLink();
</span><span class="cx"> setIsLink(!value.isNull() && !shouldProhibitLinks(this));
</span><span class="cx"> if (wasLink != isLink())
</span><del>- didAffectSelector(AffectedSelectorLink | AffectedSelectorVisited);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> process();
</span><span class="cx"> } else if (name == typeAttr) {
</span><span class="cx"> m_type = value;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptGroupElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptGroupElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> recalcSelectOptions();
</span><span class="cx">
</span><span class="cx"> if (name == disabledAttr)
</span><del>- didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLOptGroupElement::recalcSelectOptions()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> bool oldDisabled = m_disabled;
</span><span class="cx"> m_disabled = !value.isNull();
</span><span class="cx"> if (oldDisabled != m_disabled) {
</span><del>- didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><span class="cx"> renderer()->theme().stateChanged(*renderer(), ControlStates::EnabledState);
</span><span class="cx"> }
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isSelected = selected;
</span><del>- didAffectSelector(AffectedSelectorChecked);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx">
</span><span class="cx"> if (HTMLSelectElement* select = ownerSelectElement())
</span><span class="cx"> select->invalidateSelectedItems();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLProgressElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (175211 => 175212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2014-10-26 22:25:00 UTC (rev 175211)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2014-10-27 04:20:25 UTC (rev 175212)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> bool wasDeterminate = render->isDeterminate();
</span><span class="cx"> render->updateFromElement();
</span><span class="cx"> if (wasDeterminate != isDeterminate())
</span><del>- didAffectSelector(AffectedSelectorIndeterminate);
</del><ins>+ setNeedsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>