Diff
Modified: trunk/Source/WebCore/ChangeLog (139063 => 139064)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 17:29:32 UTC (rev 139064)
@@ -1,3 +1,63 @@
+2013-01-08 Hajime Morrita <morr...@google.com>
+
+ [Shadow DOM] Refactoring: invalidateParentDistributionIfNecessary() calls are too intrusive
+ https://bugs.webkit.org/show_bug.cgi?id=106305
+
+ Reviewed by Dimitri Glazkov.
+
+ Scattering invalidateParentDistributionIfNecessary() looks bad because
+ - it has long name whose terminology is cryptic for people who don't know much about Shadow DOM standard.
+ - its calls are always paired with setNeedsStyleRecalc() and people do setNeedsStyleRecalc()
+ need to be aware about distribution feature bit tracking. Separate invalidateParentDistributionIfNecessary()
+ call doesn't help that recognition.
+
+ This change introduces Element::didAffectSelector() to replace a setNeedsStyleRecalc()-i37y() call sequence.
+ SelectRuleFeatureSet::FeatureRule is renamed AffectedSelectorType so that it explains its purpose
+ in a bit more plain WebKit term.
+
+ No new tests. Refactoring.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setCSSTarget): Adopted didAffectSelector.
+ * dom/Element.cpp:
+ (WebCore::Element::didAffectSelector): Added.
+ (WebCore):
+ * dom/Element.h:
+ (Element):
+ * dom/ElementShadow.cpp:
+ (WebCore::ElementShadow::didAffectSelector): Morphed from invalidateParentDistributionIfNecessary().
+ * dom/ElementShadow.h:
+ (ElementShadow):
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::parseAttribute): Adopted didAffectSelector
+ * html/HTMLDetailsElement.cpp:
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::disabledAttributeChanged): Adopted didAffectSelector
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setChecked): Adopted didAffectSelector
+ (WebCore::HTMLInputElement::setIndeterminate): Adopted didAffectSelector
+ * html/HTMLOptGroupElement.cpp:
+ (WebCore::HTMLOptGroupElement::parseAttribute): Adopted didAffectSelector
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::parseAttribute): Adopted didAffectSelector
+ (WebCore::HTMLOptionElement::setSelectedState): Adopted didAffectSelector
+ * html/HTMLProgressElement.cpp:
+ (WebCore::HTMLProgressElement::didElementStateChange): Adopted didAffectSelector
+ * html/HTMLSummaryElement.cpp:
+ * html/shadow/HTMLContentElement.cpp:
+ * html/shadow/SelectRuleFeatureSet.cpp:
+ (WebCore::SelectRuleFeatureSet::collectFeaturesFromSelector): Followed renaming.
+ * html/shadow/SelectRuleFeatureSet.h: Followed renaming.
+ (WebCore::SelectRuleFeatureSet::hasSelectorForChecked):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForEnabled):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForDisabled):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForIndeterminate):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForLink):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForTarget):
+ (WebCore::SelectRuleFeatureSet::hasSelectorForVisited):
+ (WebCore::SelectRuleFeatureSet::hasSelectorFor):
+ (WebCore::SelectRuleFeatureSet::setSelectRuleFeature):
+
2013-01-08 Sergio Villar Senin <svil...@igalia.com>
[Qt] Fix build with --web-audio
Modified: trunk/Source/WebCore/dom/Document.cpp (139063 => 139064)
--- trunk/Source/WebCore/dom/Document.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -3438,15 +3438,11 @@
void Document::setCSSTarget(Element* n)
{
- if (m_cssTarget) {
- m_cssTarget->setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(m_cssTarget, SelectRuleFeatureSet::RuleFeatureTarget);
- }
+ if (m_cssTarget)
+ m_cssTarget->didAffectSelector(AffectedSelectorTarget);
m_cssTarget = n;
- if (n) {
- n->setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(n, SelectRuleFeatureSet::RuleFeatureTarget);
- }
+ if (n)
+ n->didAffectSelector(AffectedSelectorTarget);
}
void Document::registerNodeList(LiveNodeListBase* list)
Modified: trunk/Source/WebCore/dom/Element.cpp (139063 => 139064)
--- trunk/Source/WebCore/dom/Element.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -1409,6 +1409,13 @@
return data->shadow();
}
+void Element::didAffectSelector(AffectedSelectorMask mask)
+{
+ setNeedsStyleRecalc();
+ if (ElementShadow* elementShadow = shadowOfParentForDistribution(this))
+ elementShadow->didAffectSelector(mask);
+}
+
PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionCode& ec)
{
return ShadowRoot::create(this, ec);
Modified: trunk/Source/WebCore/dom/Element.h (139063 => 139064)
--- trunk/Source/WebCore/dom/Element.h 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/dom/Element.h 2013-01-08 17:29:32 UTC (rev 139064)
@@ -47,6 +47,17 @@
class RenderRegion;
class ShadowRoot;
+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;
+
enum SpellcheckAttributeState {
SpellcheckAttributeTrue,
SpellcheckAttributeFalse,
@@ -272,6 +283,7 @@
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
virtual bool rendererIsNeeded(const NodeRenderingContext&);
void recalcStyle(StyleChange = NoChange);
+ void didAffectSelector(AffectedSelectorMask);
ElementShadow* shadow() const;
ElementShadow* ensureShadow();
Modified: trunk/Source/WebCore/dom/ElementShadow.cpp (139063 => 139064)
--- trunk/Source/WebCore/dom/ElementShadow.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/dom/ElementShadow.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -265,15 +265,11 @@
info.addMember(m_distributor);
}
-void invalidateParentDistributionIfNecessary(Element* element, SelectRuleFeatureSet::SelectRuleFeatureMask updatedFeatures)
+void ElementShadow::didAffectSelector(AffectedSelectorMask mask)
{
- ElementShadow* elementShadow = shadowOfParentForDistribution(element);
- if (!elementShadow)
- return;
-
- elementShadow->ensureSelectFeatureSetCollected();
- if (elementShadow->selectRuleFeatureSet().hasSelectorFor(updatedFeatures))
- elementShadow->invalidateDistribution();
+ ensureSelectFeatureSetCollected();
+ if (selectRuleFeatureSet().hasSelectorFor(mask))
+ invalidateDistribution();
}
} // namespace
Modified: trunk/Source/WebCore/dom/ElementShadow.h (139063 => 139064)
--- trunk/Source/WebCore/dom/ElementShadow.h 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/dom/ElementShadow.h 2013-01-08 17:29:32 UTC (rev 139064)
@@ -71,6 +71,7 @@
ContentDistributor& distributor();
const ContentDistributor& distributor() const;
+ void didAffectSelector(AffectedSelectorMask);
bool shouldCollectSelectFeatureSet() const { return m_shouldCollectSelectFeatureSet; }
void setShouldCollectSelectFeatureSet();
void ensureSelectFeatureSetCollected();
@@ -78,7 +79,6 @@
const SelectRuleFeatureSet& selectRuleFeatureSet() const;
void reportMemoryUsage(MemoryObjectInfo*) const;
-
private:
void invalidateDistribution(Element* host);
@@ -90,8 +90,6 @@
bool m_shouldCollectSelectFeatureSet : 1;
};
-void invalidateParentDistributionIfNecessary(Element*, SelectRuleFeatureSet::SelectRuleFeatureMask updatedFeatures);
-
inline ShadowRoot* ElementShadow::youngestShadowRoot() const
{
return m_shadowRoots.head();
Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -26,7 +26,6 @@
#include "Attribute.h"
#include "DNS.h"
-#include "ElementShadow.h"
#include "EventNames.h"
#include "Frame.h"
#include "FrameLoaderClient.h"
@@ -219,10 +218,8 @@
if (name == hrefAttr) {
bool wasLink = isLink();
setIsLink(!value.isNull());
- if (wasLink != isLink()) {
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureLink | SelectRuleFeatureSet::RuleFeatureVisited | SelectRuleFeatureSet::RuleFeatureEnabled);
- }
+ if (wasLink != isLink())
+ didAffectSelector(AffectedSelectorLink | AffectedSelectorVisited | AffectedSelectorEnabled);
if (isLink()) {
String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
if (document()->isDNSPrefetchEnabled()) {
Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -22,7 +22,6 @@
#include "HTMLDetailsElement.h"
#if ENABLE(DETAILS_ELEMENT)
-#include "ElementShadow.h"
#include "HTMLContentElement.h"
#include "HTMLNames.h"
#include "HTMLSummaryElement.h"
Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -150,8 +150,7 @@
void HTMLFormControlElement::disabledAttributeChanged()
{
setNeedsWillValidateCheck();
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureDisabled | SelectRuleFeatureSet::RuleFeatureEnabled);
+ didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
if (renderer() && renderer()->style()->hasAppearance())
renderer()->theme()->stateChanged(renderer(), EnabledState);
}
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -883,7 +883,7 @@
dispatchFormControlChangeEvent();
}
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureChecked);
+ didAffectSelector(AffectedSelectorChecked);
}
void HTMLInputElement::setIndeterminate(bool newValue)
@@ -893,8 +893,7 @@
m_isIndeterminate = newValue;
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureIndeterminate);
+ didAffectSelector(AffectedSelectorIndeterminate);
if (renderer() && renderer()->style()->hasAppearance())
renderer()->theme()->stateChanged(renderer(), CheckedState);
Modified: trunk/Source/WebCore/html/HTMLOptGroupElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -26,7 +26,6 @@
#include "HTMLOptGroupElement.h"
#include "Document.h"
-#include "ElementShadow.h"
#include "HTMLNames.h"
#include "HTMLSelectElement.h"
#include "RenderMenuList.h"
@@ -85,7 +84,7 @@
recalcSelectOptions();
if (name == disabledAttr)
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureDisabled | SelectRuleFeatureSet::RuleFeatureEnabled);
+ didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
}
void HTMLOptGroupElement::recalcSelectOptions()
Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -29,7 +29,6 @@
#include "Attribute.h"
#include "Document.h"
-#include "ElementShadow.h"
#include "ExceptionCode.h"
#include "HTMLDataListElement.h"
#include "HTMLNames.h"
@@ -204,8 +203,7 @@
bool oldDisabled = m_disabled;
m_disabled = !value.isNull();
if (oldDisabled != m_disabled) {
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureDisabled | SelectRuleFeatureSet::RuleFeatureEnabled);
+ didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
if (renderer() && renderer()->style()->hasAppearance())
renderer()->theme()->stateChanged(renderer(), EnabledState);
}
@@ -258,8 +256,7 @@
return;
m_isSelected = selected;
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureChecked);
+ didAffectSelector(AffectedSelectorChecked);
if (HTMLSelectElement* select = ownerSelectElement())
select->invalidateSelectedItems();
Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLProgressElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -23,7 +23,6 @@
#if ENABLE(PROGRESS_ELEMENT)
#include "Attribute.h"
-#include "ElementShadow.h"
#include "EventNames.h"
#include "ExceptionCode.h"
#include "HTMLDivElement.h"
@@ -32,7 +31,6 @@
#include "NodeRenderingContext.h"
#include "ProgressShadowElement.h"
#include "RenderProgress.h"
-#include "SelectRuleFeatureSet.h"
#include "ShadowRoot.h"
#include <wtf/StdLibExtras.h>
@@ -160,10 +158,8 @@
if (RenderProgress* render = renderProgress()) {
bool wasDeterminate = render->isDeterminate();
render->updateFromElement();
- if (wasDeterminate != isDeterminate()) {
- setNeedsStyleRecalc();
- invalidateParentDistributionIfNecessary(this, SelectRuleFeatureSet::RuleFeatureIndeterminate);
- }
+ if (wasDeterminate != isDeterminate())
+ didAffectSelector(AffectedSelectorIndeterminate);
}
}
Modified: trunk/Source/WebCore/html/HTMLSummaryElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -23,7 +23,6 @@
#if ENABLE(DETAILS_ELEMENT)
#include "DetailsMarkerControl.h"
-#include "ElementShadow.h"
#include "HTMLContentElement.h"
#include "HTMLDetailsElement.h"
#include "HTMLNames.h"
Modified: trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -30,7 +30,6 @@
#include "CSSParser.h"
#include "ContentDistributor.h"
#include "ContentSelectorQuery.h"
-#include "ElementShadow.h"
#include "HTMLNames.h"
#include "QualifiedName.h"
#include "RuntimeEnabledFeatures.h"
Modified: trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp (139063 => 139064)
--- trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.cpp 2013-01-08 17:29:32 UTC (rev 139064)
@@ -58,25 +58,25 @@
switch (selector->pseudoType()) {
case CSSSelector::PseudoChecked:
- setSelectRuleFeature(RuleFeatureChecked);
+ setSelectRuleFeature(AffectedSelectorChecked);
break;
case CSSSelector::PseudoEnabled:
- setSelectRuleFeature(RuleFeatureEnabled);
+ setSelectRuleFeature(AffectedSelectorEnabled);
break;
case CSSSelector::PseudoDisabled:
- setSelectRuleFeature(RuleFeatureDisabled);
+ setSelectRuleFeature(AffectedSelectorDisabled);
break;
case CSSSelector::PseudoIndeterminate:
- setSelectRuleFeature(RuleFeatureIndeterminate);
+ setSelectRuleFeature(AffectedSelectorIndeterminate);
break;
case CSSSelector::PseudoLink:
- setSelectRuleFeature(RuleFeatureLink);
+ setSelectRuleFeature(AffectedSelectorLink);
break;
case CSSSelector::PseudoTarget:
- setSelectRuleFeature(RuleFeatureTarget);
+ setSelectRuleFeature(AffectedSelectorTarget);
break;
case CSSSelector::PseudoVisited:
- setSelectRuleFeature(RuleFeatureVisited);
+ setSelectRuleFeature(AffectedSelectorVisited);
break;
default:
break;
Modified: trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h (139063 => 139064)
--- trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h 2013-01-08 16:47:55 UTC (rev 139063)
+++ trunk/Source/WebCore/html/shadow/SelectRuleFeatureSet.h 2013-01-08 17:29:32 UTC (rev 139064)
@@ -31,6 +31,7 @@
#ifndef SelectRuleFeatureSet_h
#define SelectRuleFeatureSet_h
+#include "Element.h"
#include "RuleFeature.h"
namespace WebCore {
@@ -47,29 +48,18 @@
bool hasSelectorForClass(const AtomicString&) const;
bool hasSelectorForAttribute(const AtomicString&) const;
- bool hasSelectorForChecked() const { return hasSelectorFor(RuleFeatureChecked); }
- bool hasSelectorForEnabled() const { return hasSelectorFor(RuleFeatureEnabled); }
- bool hasSelectorForDisabled() const { return hasSelectorFor(RuleFeatureDisabled); }
- bool hasSelectorForIndeterminate() const { return hasSelectorFor(RuleFeatureIndeterminate); }
- bool hasSelectorForLink() const { return hasSelectorFor(RuleFeatureLink); }
- bool hasSelectorForTarget() const { return hasSelectorFor(RuleFeatureTarget); }
- bool hasSelectorForVisited() const { return hasSelectorFor(RuleFeatureVisited); }
+ bool hasSelectorForChecked() const { return hasSelectorFor(AffectedSelectorChecked); }
+ bool hasSelectorForEnabled() const { return hasSelectorFor(AffectedSelectorEnabled); }
+ bool hasSelectorForDisabled() const { return hasSelectorFor(AffectedSelectorDisabled); }
+ bool hasSelectorForIndeterminate() const { return hasSelectorFor(AffectedSelectorIndeterminate); }
+ bool hasSelectorForLink() const { return hasSelectorFor(AffectedSelectorLink); }
+ bool hasSelectorForTarget() const { return hasSelectorFor(AffectedSelectorTarget); }
+ bool hasSelectorForVisited() const { return hasSelectorFor(AffectedSelectorVisited); }
- enum SelectRuleFeature {
- RuleFeatureChecked = 1,
- RuleFeatureEnabled = 1 << 1,
- RuleFeatureDisabled = 1 << 2,
- RuleFeatureIndeterminate = 1 << 3,
- RuleFeatureLink = 1 << 4,
- RuleFeatureTarget = 1 << 5,
- RuleFeatureVisited = 1 << 6
- };
- typedef int SelectRuleFeatureMask;
+ bool hasSelectorFor(AffectedSelectorMask features) const { return m_featureFlags & features; }
- bool hasSelectorFor(SelectRuleFeatureMask features) const { return m_featureFlags & features; }
-
private:
- void setSelectRuleFeature(SelectRuleFeature feature) { m_featureFlags |= feature; }
+ void setSelectRuleFeature(AffectedSelectorType feature) { m_featureFlags |= feature; }
RuleFeatureSet m_cssRuleFeatureSet;
int m_featureFlags;
