<!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>[150070] 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/150070">150070</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-05-14 08:59:14 -0700 (Tue, 14 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorListcpp">trunk/Source/WebCore/css/CSSSelectorList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorListh">trunk/Source/WebCore/css/CSSSelectorList.h</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetscpp">trunk/Source/WebCore/css/DocumentRuleSets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetsh">trunk/Source/WebCore/css/DocumentRuleSets.h</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorFiltercpp">trunk/Source/WebCore/css/SelectorFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowInsertionPointcpp">trunk/Source/WebCore/html/shadow/InsertionPoint.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowInsertionPointh">trunk/Source/WebCore/html/shadow/InsertionPoint.h</a></li>
</ul>

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

</body>
</html>