Diff
Modified: trunk/Source/WebCore/ChangeLog (150069 => 150070)
--- trunk/Source/WebCore/ChangeLog 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/ChangeLog 2013-05-14 15:59:14 UTC (rev 150070)
@@ -1,3 +1,46 @@
+2013-05-14 Antti Koivisto <an...@apple.com>
+
+ Remove ::-webkit-distributed()
+ https://bugs.webkit.org/show_bug.cgi?id=116106
+
+ Reviewed by Andreas Kling.
+
+ This experimental Shadow DOM selector code is unused and has no owner.
+
+ * css/CSSGrammar.y.in:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::rewriteSpecifiersWithNamespaceIfNeeded):
+ (WebCore::CSSParser::rewriteSpecifiersWithElementName):
+ * css/CSSParser.h:
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::CSSParserSelector):
+ * css/CSSParserValues.h:
+ (CSSParserSelector):
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::pseudoId):
+ (WebCore::nameToPseudoTypeMap):
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ * css/CSSSelectorList.cpp:
+ * css/CSSSelectorList.h:
+ (CSSSelectorList):
+ * css/DocumentRuleSets.cpp:
+ (WebCore::DocumentRuleSets::resetAuthorStyle):
+ * css/DocumentRuleSets.h:
+ (DocumentRuleSets):
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::matchAuthorRules):
+ * css/ElementRuleCollector.h:
+ (ElementRuleCollector):
+ * css/RuleSet.cpp:
+ (WebCore::RuleSet::addChildRules):
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::match):
+ * css/SelectorFilter.cpp:
+ (WebCore::SelectorFilter::collectIdentifierHashes):
+ * html/shadow/InsertionPoint.cpp:
+ * html/shadow/InsertionPoint.h:
+
2013-05-14 Daker Fernandes Pinheiro <daker.pinhe...@openbossa.org>
Remove RenderTheme::supportsCalendarPicker
Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (150069 => 150070)
--- trunk/Source/WebCore/css/CSSGrammar.y.in 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2013-05-14 15:59:14 UTC (rev 150070)
@@ -215,7 +215,6 @@
%token <string> CUEFUNCTION
#endif
%token <string> NOTFUNCTION
-%token <string> DISTRIBUTEDFUNCTION
%token <string> CALCFUNCTION
%token <string> MINFUNCTION
%token <string> MAXFUNCTION
@@ -1456,19 +1455,6 @@
$$ = 0;
}
#endif
-#if ENABLE_SHADOW_DOM
- | ':' ':' DISTRIBUTEDFUNCTION maybe_space selector maybe_space ')' {
- if (!$5)
- $$ = 0;
- else {
- $$ = parser->createFloatingSelector();
- $$->setMatch(CSSSelector::PseudoElement);
- $$->setFunctionArgumentSelector($5);
- $3.lower();
- $$->setValue($3);
- }
- }
-#endif
// use by :-webkit-any.
// FIXME: should we support generic selectors here or just simple_selectors?
// Use simple_selector_list for now to match -moz-any.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/CSSParser.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -11618,12 +11618,6 @@
{
if (m_defaultNamespace != starAtom || specifiers->isCustomPseudoElement())
return rewriteSpecifiersWithElementName(nullAtom, starAtom, specifiers, /*tagIsForNamespaceRule*/true);
-#if ENABLE(SHADOW_DOM)
- if (CSSParserSelector* distributedPseudoElementSelector = specifiers->findDistributedPseudoElementSelector()) {
- specifiers->prependTagSelector(QualifiedName(nullAtom, starAtom, m_defaultNamespace), /*tagIsForNamespaceRule*/true);
- return rewriteSpecifiersForShadowDistributed(specifiers, distributedPseudoElementSelector);
- }
-#endif
return specifiers;
}
@@ -11632,13 +11626,6 @@
AtomicString determinedNamespace = namespacePrefix != nullAtom && m_styleSheet ? m_styleSheet->determineNamespace(namespacePrefix) : m_defaultNamespace;
QualifiedName tag(namespacePrefix, elementName, determinedNamespace);
-#if ENABLE(SHADOW_DOM)
- if (CSSParserSelector* distributedPseudoElementSelector = specifiers->findDistributedPseudoElementSelector()) {
- specifiers->prependTagSelector(tag, tagIsForNamespaceRule);
- return rewriteSpecifiersForShadowDistributed(specifiers, distributedPseudoElementSelector);
- }
-#endif
-
if (!specifiers->isCustomPseudoElement()) {
if (tag == anyQName())
return specifiers;
@@ -11671,27 +11658,6 @@
return specifiers;
}
-#if ENABLE(SHADOW_DOM)
-CSSParserSelector* CSSParser::rewriteSpecifiersForShadowDistributed(CSSParserSelector* specifiers, CSSParserSelector* distributedPseudoElementSelector)
-{
- CSSParserSelector* argumentSelector = distributedPseudoElementSelector->functionArgumentSelector();
- ASSERT(argumentSelector);
- ASSERT(!specifiers->isDistributedPseudoElement());
- for (CSSParserSelector* end = specifiers; end->tagHistory(); end = end->tagHistory()) {
- if (end->tagHistory()->isDistributedPseudoElement()) {
- end->clearTagHistory();
- break;
- }
- }
- CSSParserSelector* end = argumentSelector;
- while (end->tagHistory())
- end = end->tagHistory();
- end->setTagHistory(sinkFloatingSelector(specifiers));
- end->setRelation(CSSSelector::ShadowDistributed);
- return argumentSelector;
-}
-#endif
-
CSSParserSelector* CSSParser::rewriteSpecifiers(CSSParserSelector* specifiers, CSSParserSelector* newSpecifier)
{
#if ENABLE(VIDEO_TRACK)
Modified: trunk/Source/WebCore/css/CSSParser.h (150069 => 150070)
--- trunk/Source/WebCore/css/CSSParser.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSParser.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -356,9 +356,6 @@
CSSParserSelector* rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector*, bool isNamespacePlaceholder = false);
CSSParserSelector* rewriteSpecifiersWithNamespaceIfNeeded(CSSParserSelector*);
CSSParserSelector* rewriteSpecifiers(CSSParserSelector*, CSSParserSelector*);
-#if ENABLE(SHADOW_DOM)
- CSSParserSelector* rewriteSpecifiersForShadowDistributed(CSSParserSelector* specifiers, CSSParserSelector* distributedPseudoElementSelector);
-#endif
void invalidBlockHit();
Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/CSSParserValues.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -148,9 +148,6 @@
CSSParserSelector::CSSParserSelector()
: m_selector(adoptPtr(fastNew<CSSSelector>()))
-#if ENABLE(SHADOW_DOM)
- , m_functionArgumentSelector(0)
-#endif
{
}
@@ -230,17 +227,5 @@
m_selector->m_relation = CSSSelector::SubSelector;
}
-#if ENABLE(SHADOW_DOM)
-CSSParserSelector* CSSParserSelector::findDistributedPseudoElementSelector() const
-{
- CSSParserSelector* selector = const_cast<CSSParserSelector*>(this);
- do {
- if (selector->isDistributedPseudoElement())
- return selector;
- } while ((selector = selector->tagHistory()));
- return 0;
}
-#endif
-}
-
Modified: trunk/Source/WebCore/css/CSSParserValues.h (150069 => 150070)
--- trunk/Source/WebCore/css/CSSParserValues.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -186,13 +186,6 @@
void adoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectorVector);
-#if ENABLE(SHADOW_DOM)
- CSSParserSelector* functionArgumentSelector() const { return m_functionArgumentSelector; }
- void setFunctionArgumentSelector(CSSParserSelector* selector) { m_functionArgumentSelector = selector; }
- bool isDistributedPseudoElement() const { return m_selector->isDistributedPseudoElement(); }
- CSSParserSelector* findDistributedPseudoElementSelector() const;
-#endif
-
CSSSelector::PseudoType pseudoType() const { return m_selector->pseudoType(); }
bool isCustomPseudoElement() const { return m_selector->isCustomPseudoElement(); }
@@ -209,9 +202,6 @@
private:
OwnPtr<CSSSelector> m_selector;
OwnPtr<CSSParserSelector> m_tagHistory;
-#if ENABLE(SHADOW_DOM)
- CSSParserSelector* m_functionArgumentSelector;
-#endif
};
inline bool CSSParserSelector::hasShadowDescendant() const
Modified: trunk/Source/WebCore/css/CSSSelector.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/CSSSelector.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -244,9 +244,6 @@
#if ENABLE(IFRAME_SEAMLESS)
case PseudoSeamlessDocument:
#endif
-#if ENABLE(SHADOW_DOM)
- case PseudoDistributed:
-#endif
return NOPSEUDO;
case PseudoNotParsed:
ASSERT_NOT_REACHED();
@@ -337,9 +334,6 @@
#if ENABLE(IFRAME_SEAMLESS)
DEFINE_STATIC_LOCAL(AtomicString, seamlessDocument, ("-webkit-seamless-document", AtomicString::ConstructFromLiteral));
#endif
-#if ENABLE(SHADOW_DOM)
- DEFINE_STATIC_LOCAL(AtomicString, distributed, ("-webkit-distributed(", AtomicString::ConstructFromLiteral));
-#endif
DEFINE_STATIC_LOCAL(AtomicString, inRange, ("in-range", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, outOfRange, ("out-of-range", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(AtomicString, scope, ("scope", AtomicString::ConstructFromLiteral));
@@ -425,9 +419,6 @@
#if ENABLE(IFRAME_SEAMLESS)
nameToPseudoType->set(seamlessDocument.impl(), CSSSelector::PseudoSeamlessDocument);
#endif
-#if ENABLE(SHADOW_DOM)
- nameToPseudoType->set(distributed.impl(), CSSSelector::PseudoDistributed);
-#endif
nameToPseudoType->set(inRange.impl(), CSSSelector::PseudoInRange);
nameToPseudoType->set(outOfRange.impl(), CSSSelector::PseudoOutOfRange);
}
@@ -716,10 +707,6 @@
ASSERT_NOT_REACHED();
case CSSSelector::ShadowDescendant:
return tagHistory->selectorText(str.toString() + rightSide);
-#if ENABLE(SHADOW_DOM)
- case CSSSelector::ShadowDistributed:
- return tagHistory->selectorText("::-webkit-distributed(" + str.toString() + rightSide + ")");
-#endif
}
}
return str.toString() + rightSide;
Modified: trunk/Source/WebCore/css/CSSSelector.h (150069 => 150070)
--- trunk/Source/WebCore/css/CSSSelector.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSSelector.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -78,9 +78,6 @@
IndirectAdjacent,
SubSelector,
ShadowDescendant,
-#if ENABLE(SHADOW_DOM)
- ShadowDistributed
-#endif
};
enum PseudoType {
@@ -169,9 +166,6 @@
#if ENABLE(IFRAME_SEAMLESS)
PseudoSeamlessDocument,
#endif
-#if ENABLE(SHADOW_DOM)
- PseudoDistributed
-#endif
};
enum MarginBoxType {
@@ -226,10 +220,6 @@
bool isCustomPseudoElement() const;
bool isSiblingSelector() const;
bool isAttributeSelector() const;
-#if ENABLE(SHADOW_DOM)
- bool isDistributedPseudoElement() const;
- bool isShadowDistributed() const;
-#endif
Relation relation() const { return static_cast<Relation>(m_relation); }
@@ -342,18 +332,6 @@
|| m_match == CSSSelector::End;
}
-#if ENABLE(SHADOW_DOM)
-inline bool CSSSelector::isDistributedPseudoElement() const
-{
- return m_match == PseudoElement && pseudoType() == PseudoDistributed;
-}
-
-inline bool CSSSelector::isShadowDistributed() const
-{
- return m_relation == CSSSelector::ShadowDistributed;
-}
-#endif
-
inline void CSSSelector::setValue(const AtomicString& value)
{
ASSERT(m_match != Tag);
Modified: trunk/Source/WebCore/css/CSSSelectorList.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/CSSSelectorList.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSSelectorList.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -180,20 +180,4 @@
return forEachSelector(functor, this);
}
-#if ENABLE(SHADOW_DOM)
-class SelectorHasShadowDistributed {
-public:
- bool operator()(const CSSSelector* selector)
- {
- return selector->isShadowDistributed();
- }
-};
-
-bool CSSSelectorList::hasShadowDistributedAt(size_t index) const
-{
- SelectorHasShadowDistributed functor;
- return forEachTagSelector(functor, selectorAt(index));
-}
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSSelectorList.h (150069 => 150070)
--- trunk/Source/WebCore/css/CSSSelectorList.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/CSSSelectorList.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -61,10 +61,6 @@
bool selectorsNeedNamespaceResolution();
bool hasInvalidSelector() const;
-#if ENABLE(SHADOW_DOM)
- bool hasShadowDistributedAt(size_t index) const;
-#endif
-
String selectorsText() const;
private:
Modified: trunk/Source/WebCore/css/DocumentRuleSets.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/DocumentRuleSets.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/DocumentRuleSets.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -38,25 +38,6 @@
namespace WebCore {
-#if ENABLE(SHADOW_DOM)
-void ShadowDistributedRules::addRule(StyleRule* rule, size_t selectorIndex, ContainerNode* scope, AddRuleFlags addRuleFlags)
-{
- if (m_shadowDistributedRuleSetMap.contains(scope))
- m_shadowDistributedRuleSetMap.get(scope)->addRule(rule, selectorIndex, addRuleFlags);
- else {
- OwnPtr<RuleSet> ruleSetForScope = adoptPtr(new RuleSet());
- ruleSetForScope->addRule(rule, selectorIndex, addRuleFlags);
- m_shadowDistributedRuleSetMap.add(scope, ruleSetForScope.release());
- }
-}
-
-void ShadowDistributedRules::collectMatchRequests(bool includeEmptyRules, Vector<MatchRequest>& matchRequests)
-{
- for (ShadowDistributedRuleSetMap::iterator it = m_shadowDistributedRuleSetMap.begin(); it != m_shadowDistributedRuleSetMap.end(); ++it)
- matchRequests.append(MatchRequest(it->value.get(), includeEmptyRules, it->key));
-}
-#endif
-
DocumentRuleSets::DocumentRuleSets()
{
}
@@ -100,9 +81,6 @@
{
m_authorStyle = RuleSet::create();
m_authorStyle->disableAutoShrinkToFit();
-#if ENABLE(SHADOW_DOM)
- m_shadowDistributedRules.clear();
-#endif
}
void DocumentRuleSets::appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >& styleSheets, MediaQueryEvaluator* medium, InspectorCSSOMWrappers& inspectorCSSOMWrappers, bool isViewSource, StyleResolver* resolver)
Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (150069 => 150070)
--- trunk/Source/WebCore/css/DocumentRuleSets.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -41,19 +41,6 @@
class RuleSet;
class StyleScopeResolver;
-#if ENABLE(SHADOW_DOM)
-class ShadowDistributedRules {
-public:
- void addRule(StyleRule*, size_t selectorIndex, ContainerNode* scope, AddRuleFlags);
- void collectMatchRequests(bool includeEmptyRules, Vector<MatchRequest>&);
- void clear() { m_shadowDistributedRuleSetMap.clear(); }
- bool isEmpty() const { return m_shadowDistributedRuleSetMap.isEmpty(); }
-private:
- typedef HashMap<const ContainerNode*, OwnPtr<RuleSet> > ShadowDistributedRuleSetMap;
- ShadowDistributedRuleSetMap m_shadowDistributedRuleSetMap;
-};
-#endif
-
class DocumentRuleSets {
public:
DocumentRuleSets();
@@ -70,9 +57,6 @@
void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >&, MediaQueryEvaluator*, InspectorCSSOMWrappers&, bool isViewSource, StyleResolver*);
void collectFeatures(bool isViewSource, StyleScopeResolver*);
-#if ENABLE(SHADOW_DOM)
- ShadowDistributedRules& shadowDistributedRules() { return m_shadowDistributedRules; }
-#endif
private:
void collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSStyleSheet> >&, RuleSet& userStyle, const MediaQueryEvaluator&, StyleResolver&);
@@ -81,9 +65,6 @@
RuleFeatureSet m_features;
OwnPtr<RuleSet> m_siblingRuleSet;
OwnPtr<RuleSet> m_uncommonAttributeRuleSet;
-#if ENABLE(SHADOW_DOM)
- ShadowDistributedRules m_shadowDistributedRules;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -277,22 +277,6 @@
#endif
}
-#if ENABLE(SHADOW_DOM)
-inline void ElementRuleCollector::matchShadowDistributedRules(bool includeEmptyRules, StyleResolver::RuleRange& ruleRange)
-{
- if (m_ruleSets.shadowDistributedRules().isEmpty())
- return;
-
- TemporaryChange<bool> canUseFastReject(m_canUseFastReject, false);
- TemporaryChange<SelectorChecker::BehaviorAtBoundary> behaviorAtBoundary(m_behaviorAtBoundary, SelectorChecker::CrossesBoundary);
-
- Vector<MatchRequest> matchRequests;
- m_ruleSets.shadowDistributedRules().collectMatchRequests(includeEmptyRules, matchRequests);
- for (size_t i = 0; i < matchRequests.size(); ++i)
- collectMatchingRules(matchRequests[i], ruleRange);
-}
-#endif
-
void ElementRuleCollector::matchAuthorRules(bool includeEmptyRules)
{
clearMatchedRules();
@@ -306,9 +290,7 @@
StyleResolver::RuleRange ruleRange = m_result.ranges.authorRuleRange();
collectMatchingRules(matchRequest, ruleRange);
collectMatchingRulesForRegion(matchRequest, ruleRange);
-#if ENABLE(SHADOW_DOM)
- matchShadowDistributedRules(includeEmptyRules, ruleRange);
-#endif
+
sortAndTransferMatchedRules();
matchScopedAuthorRules(includeEmptyRules);
Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (150069 => 150070)
--- trunk/Source/WebCore/css/ElementRuleCollector.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -74,9 +74,6 @@
void addElementStyleProperties(const StylePropertySet*, bool isCacheable = true);
void matchUARules(RuleSet*);
-#if ENABLE(SHADOW_DOM)
- void matchShadowDistributedRules(bool includeEmptyRules, StyleResolver::RuleRange&);
-#endif
void matchScopedAuthorRules(bool includeEmptyRules);
void matchHostRules(bool includeEmptyRules);
Modified: trunk/Source/WebCore/css/RuleSet.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/RuleSet.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -277,22 +277,7 @@
if (rule->isStyleRule()) {
StyleRule* styleRule = static_cast<StyleRule*>(rule);
-#if ENABLE(SHADOW_DOM)
- if (!scope)
- addStyleRule(styleRule, addRuleFlags);
- else {
- const CSSSelectorList& selectorList = styleRule->selectorList();
- for (size_t selectorIndex = 0; selectorIndex != notFound; selectorIndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) {
- if (selectorList.hasShadowDistributedAt(selectorIndex))
- resolver->ruleSets().shadowDistributedRules().addRule(styleRule, selectorIndex, const_cast<ContainerNode*>(scope), addRuleFlags);
- else
- addRule(styleRule, selectorIndex, addRuleFlags);
- }
- }
-#else
addStyleRule(styleRule, addRuleFlags);
-#endif
-
} else if (rule->isPageRule())
addPageRule(static_cast<StyleRulePage*>(rule));
else if (rule->isMediaRule()) {
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -283,24 +283,6 @@
nextContext.elementStyle = 0;
return match(nextContext, ignoreDynamicPseudo);
}
-#if ENABLE(SHADOW_DOM)
- case CSSSelector::ShadowDistributed:
- {
- Vector<InsertionPoint*, 8> insertionPoints;
- for (Element* element = context.element; element; element = element->parentElement()) {
- insertionPoints.clear();
- collectInsertionPointsWhereNodeIsDistributed(element, insertionPoints);
- for (size_t i = 0; i < insertionPoints.size(); ++i) {
- nextContext.element = insertionPoints[i];
- nextContext.isSubSelector = false;
- nextContext.elementStyle = 0;
- if (match(nextContext, ignoreDynamicPseudo) == SelectorMatches)
- return SelectorMatches;
- }
- }
- return SelectorFailsCompletely;
- }
-#endif
}
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/css/SelectorFilter.cpp (150069 => 150070)
--- trunk/Source/WebCore/css/SelectorFilter.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/css/SelectorFilter.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -148,9 +148,6 @@
case CSSSelector::DirectAdjacent:
case CSSSelector::IndirectAdjacent:
case CSSSelector::ShadowDescendant:
-#if ENABLE(SHADOW_DOM)
- case CSSSelector::ShadowDistributed:
-#endif
skipOverSubselectors = true;
break;
case CSSSelector::Descendant:
Modified: trunk/Source/WebCore/html/shadow/InsertionPoint.cpp (150069 => 150070)
--- trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2013-05-14 15:59:14 UTC (rev 150070)
@@ -216,21 +216,4 @@
return insertionPoint;
}
-void collectInsertionPointsWhereNodeIsDistributed(const Node* node, Vector<InsertionPoint*, 8>& results)
-{
- const Node* current = node;
- while (true) {
- if (ElementShadow* shadow = shadowOfParentForDistribution(current)) {
- if (ShadowRoot* root = current->containingShadowRoot())
- ContentDistributor::ensureDistribution(root);
- if (InsertionPoint* insertedTo = shadow->distributor().findInsertionPointFor(node)) {
- current = insertedTo;
- results.append(insertedTo);
- continue;
- }
- }
- return;
- }
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/html/shadow/InsertionPoint.h (150069 => 150070)
--- trunk/Source/WebCore/html/shadow/InsertionPoint.h 2013-05-14 14:29:57 UTC (rev 150069)
+++ trunk/Source/WebCore/html/shadow/InsertionPoint.h 2013-05-14 15:59:14 UTC (rev 150070)
@@ -159,8 +159,6 @@
InsertionPoint* resolveReprojection(const Node*);
-void collectInsertionPointsWhereNodeIsDistributed(const Node*, Vector<InsertionPoint*, 8>& results);
-
} // namespace WebCore
#endif // InsertionPoint_h
