<!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>[150010] trunk/Source</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/150010">150010</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-05-13 07:26:27 -0700 (Mon, 13 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove unneeded counters from ScopeContentDistribution.
https://bugs.webkit.org/show_bug.cgi?id=116028

Reviewed by Andreas Kling.

They don't do much.

* WebCore.exp.in:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
* dom/ShadowRoot.h:
        
    No need for registration code anymore.

* html/shadow/ContentDistributor.cpp:
(WebCore::ScopeContentDistribution::ScopeContentDistribution):
        
    Default m_insertionPointListIsValid to true to avoid crawling when there are no InsertionPoints.

(WebCore::ScopeContentDistribution::ensureInsertionPointList):
(WebCore::ScopeContentDistribution::registerInsertionPoint):
(WebCore::ScopeContentDistribution::unregisterInsertionPoint):
* html/shadow/ContentDistributor.h:
        
    Remove distributeNodeChildrenTo, it was only used by the older/younger shadow root code.

* testing/Internals.cpp:
* testing/Internals.h:
* testing/Internals.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowContentDistributorcpp">trunk/Source/WebCore/html/shadow/ContentDistributor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowContentDistributorh">trunk/Source/WebCore/html/shadow/ContentDistributor.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/ChangeLog        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2013-05-13  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Remove unneeded counters from ScopeContentDistribution.
+        https://bugs.webkit.org/show_bug.cgi?id=116028
+
+        Reviewed by Andreas Kling.
+
+        They don't do much.
+
+        * WebCore.exp.in:
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        * dom/ShadowRoot.h:
+        
+            No need for registration code anymore.
+
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ScopeContentDistribution::ScopeContentDistribution):
+        
+            Default m_insertionPointListIsValid to true to avoid crawling when there are no InsertionPoints.
+
+        (WebCore::ScopeContentDistribution::ensureInsertionPointList):
+        (WebCore::ScopeContentDistribution::registerInsertionPoint):
+        (WebCore::ScopeContentDistribution::unregisterInsertionPoint):
+        * html/shadow/ContentDistributor.h:
+        
+            Remove distributeNodeChildrenTo, it was only used by the older/younger shadow root code.
+
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
</ins><span class="cx"> 2013-05-13  Seokju Kwon  &lt;seokju.kwon@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Remove unused references from projects in Visual Studio
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/WebCore.exp.in        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -769,8 +769,6 @@
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserver14willDetachPageEv
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserverC2EPNS_5FrameE
</span><span class="cx"> __ZN7WebCore24FrameDestructionObserverD2Ev
</span><del>-__ZN7WebCore24ScopeContentDistribution17hasContentElementEPKNS_10ShadowRootE
-__ZN7WebCore24ScopeContentDistribution18countElementShadowEPKNS_10ShadowRootE
</del><span class="cx"> __ZN7WebCore24createFragmentFromMarkupEPNS_8DocumentERKN3WTF6StringES5_NS_19ParserContentPolicyE
</span><span class="cx"> __ZN7WebCore24decodeURLEscapeSequencesERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore24deleteCookiesForHostnameERKNS_21NetworkStorageSessionERKN3WTF6StringE
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx">     , m_applyAuthorStyles(false)
</span><span class="cx">     , m_resetStyleInheritance(false)
</span><span class="cx">     , m_type(type)
</span><del>-    , m_registeredWithParentShadowRoot(false)
</del><span class="cx"> {
</span><span class="cx">     ASSERT(document);
</span><span class="cx"> }
</span><span class="lines">@@ -175,42 +174,6 @@
</span><span class="cx">     styleResolver-&gt;popParentShadowRoot(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Node::InsertionNotificationRequest ShadowRoot::insertedInto(ContainerNode* insertionPoint)
-{
-    DocumentFragment::insertedInto(insertionPoint);
-
-    if (!insertionPoint-&gt;inDocument())
-        return InsertionDone;
-
-    // FIXME: When parsing &lt;video controls&gt;, insertedInto() is called many times without invoking removedFrom.
-    // For now, we check m_registeredWithParentShadowroot. We would like to ASSERT(!m_registeredShadowRoot) here.
-    // https://bugs.webkit.org/show_bug.cig?id=101316
-    if (m_registeredWithParentShadowRoot)
-        return InsertionDone;
-
-    if (ShadowRoot* root = host()-&gt;containingShadowRoot()) {
-        root-&gt;ensureScopeDistribution()-&gt;registerElementShadow();
-        m_registeredWithParentShadowRoot = true;
-    }
-
-    return InsertionDone;
-}
-
-void ShadowRoot::removedFrom(ContainerNode* insertionPoint)
-{
-    if (insertionPoint-&gt;inDocument() &amp;&amp; m_registeredWithParentShadowRoot) {
-        ShadowRoot* root = host()-&gt;containingShadowRoot();
-        if (!root)
-            root = insertionPoint-&gt;containingShadowRoot();
-
-        if (root &amp;&amp; root-&gt;scopeDistribution())
-            root-&gt;scopeDistribution()-&gt;unregisterElementShadow();
-        m_registeredWithParentShadowRoot = false;
-    }
-
-    DocumentFragment::removedFrom(insertionPoint);
-}
-
</del><span class="cx"> void ShadowRoot::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
</span><span class="cx"> {
</span><span class="cx">     if (isOrphan())
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/dom/ShadowRoot.h        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -74,9 +74,6 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void attach();
</span><span class="cx"> 
</span><del>-    virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
-    virtual void removedFrom(ContainerNode*) OVERRIDE;
-
</del><span class="cx">     virtual void registerScopedHTMLStyleChild() OVERRIDE;
</span><span class="cx">     virtual void unregisterScopedHTMLStyleChild() OVERRIDE;
</span><span class="cx"> 
</span><span class="lines">@@ -106,7 +103,6 @@
</span><span class="cx">     unsigned m_applyAuthorStyles : 1;
</span><span class="cx">     unsigned m_resetStyleInheritance : 1;
</span><span class="cx">     unsigned m_type : 1;
</span><del>-    unsigned m_registeredWithParentShadowRoot : 1;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> inline Element* ShadowRoot::activeElement() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowContentDistributorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.cpp (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ContentDistributor.cpp        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.cpp        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -75,9 +75,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> ScopeContentDistribution::ScopeContentDistribution()
</span><del>-    : m_numberOfContentElementChildren(0)
-    , m_numberOfElementShadowChildren(0)
-    , m_insertionPointListIsValid(false)
</del><ins>+    : m_insertionPointListIsValid(true)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -95,9 +93,6 @@
</span><span class="cx">     m_insertionPointListIsValid = true;
</span><span class="cx">     ASSERT(m_insertionPointList.isEmpty());
</span><span class="cx"> 
</span><del>-    if (!hasInsertionPoint(shadowRoot))
-        return m_insertionPointList;
-
</del><span class="cx">     for (Element* element = ElementTraversal::firstWithin(shadowRoot); element; element = ElementTraversal::next(element, shadowRoot)) {
</span><span class="cx">         if (element-&gt;isInsertionPoint())
</span><span class="cx">             m_insertionPointList.append(toInsertionPoint(element));
</span><span class="lines">@@ -106,50 +101,16 @@
</span><span class="cx">     return m_insertionPointList;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScopeContentDistribution::registerInsertionPoint(InsertionPoint* point)
</del><ins>+void ScopeContentDistribution::registerInsertionPoint(InsertionPoint*)
</ins><span class="cx"> {
</span><del>-    switch (point-&gt;insertionPointType()) {
-    case InsertionPoint::ContentInsertionPoint:
-        ++m_numberOfContentElementChildren;
-        break;
-    }
-
</del><span class="cx">     invalidateInsertionPointList();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScopeContentDistribution::unregisterInsertionPoint(InsertionPoint* point)
</del><ins>+void ScopeContentDistribution::unregisterInsertionPoint(InsertionPoint*)
</ins><span class="cx"> {
</span><del>-    switch (point-&gt;insertionPointType()) {
-    case InsertionPoint::ContentInsertionPoint:
-        ASSERT(m_numberOfContentElementChildren &gt; 0);
-        --m_numberOfContentElementChildren;
-        break;
-    }
-
</del><span class="cx">     invalidateInsertionPointList();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ScopeContentDistribution::hasContentElement(const ShadowRoot* holder)
-{
-    if (!holder-&gt;scopeDistribution())
-        return false;
-
-    return holder-&gt;scopeDistribution()-&gt;hasContentElementChildren();
-}
-
-unsigned ScopeContentDistribution::countElementShadow(const ShadowRoot* holder)
-{
-    if (!holder-&gt;scopeDistribution())
-        return 0;
-
-    return holder-&gt;scopeDistribution()-&gt;numberOfElementShadowChildren();
-}
-
-bool ScopeContentDistribution::hasInsertionPoint(const ShadowRoot* holder)
-{
-    return hasContentElement(holder);
-}
-
</del><span class="cx"> ContentDistributor::ContentDistributor()
</span><span class="cx">     : m_validity(Undetermined)
</span><span class="cx"> {
</span><span class="lines">@@ -261,34 +222,6 @@
</span><span class="cx">     insertionPoint-&gt;setDistribution(distribution);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ContentDistributor::distributeNodeChildrenTo(InsertionPoint* insertionPoint, ContainerNode* containerNode)
-{
-    ContentDistribution distribution;
-    for (Node* node = containerNode-&gt;firstChild(); node; node = node-&gt;nextSibling()) {
-        if (isActiveInsertionPoint(node)) {
-            InsertionPoint* innerInsertionPoint = toInsertionPoint(node);
-            if (innerInsertionPoint-&gt;hasDistribution()) {
-                for (size_t i = 0; i &lt; innerInsertionPoint-&gt;size(); ++i) {
-                    distribution.append(innerInsertionPoint-&gt;at(i));
-                    if (!m_nodeToInsertionPoint.contains(innerInsertionPoint-&gt;at(i)))
-                        m_nodeToInsertionPoint.add(innerInsertionPoint-&gt;at(i), insertionPoint);
-                }
-            } else {
-                for (Node* child = innerInsertionPoint-&gt;firstChild(); child; child = child-&gt;nextSibling()) {
-                    distribution.append(child);
-                    m_nodeToInsertionPoint.add(child, insertionPoint);
-                }
-            }
-        } else {
-            distribution.append(node);
-            if (!m_nodeToInsertionPoint.contains(node))
-                m_nodeToInsertionPoint.add(node, insertionPoint);
-        }
-    }
-
-    insertionPoint-&gt;setDistribution(distribution);
-}
-
</del><span class="cx"> void ContentDistributor::ensureDistribution(ShadowRoot* shadowRoot)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(shadowRoot);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowContentDistributorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.h (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ContentDistributor.h        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.h        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -76,26 +76,11 @@
</span><span class="cx"> 
</span><span class="cx">     void registerInsertionPoint(InsertionPoint*);
</span><span class="cx">     void unregisterInsertionPoint(InsertionPoint*);
</span><del>-    bool hasContentElementChildren() const { return m_numberOfContentElementChildren &gt; 0; }
</del><span class="cx"> 
</span><del>-    void registerElementShadow() { ++m_numberOfElementShadowChildren; }
-    void unregisterElementShadow() { ASSERT(m_numberOfElementShadowChildren &gt; 0); --m_numberOfElementShadowChildren; }
-    unsigned numberOfElementShadowChildren() const { return m_numberOfElementShadowChildren; }
-    bool hasElementShadowChildren() const { return m_numberOfElementShadowChildren &gt; 0; }
-
</del><span class="cx">     void invalidateInsertionPointList();
</span><span class="cx">     const Vector&lt;RefPtr&lt;InsertionPoint&gt; &gt;&amp; ensureInsertionPointList(ShadowRoot*);
</span><span class="cx"> 
</span><del>-    bool isUsedForRendering() const;
-
-    static bool hasContentElement(const ShadowRoot*);
-    static bool hasInsertionPoint(const ShadowRoot*);
-    static bool hasElementShadow(const ShadowRoot* holder) { return countElementShadow(holder); }
-    static unsigned countElementShadow(const ShadowRoot*);
-
</del><span class="cx"> private:
</span><del>-    unsigned m_numberOfContentElementChildren;
-    unsigned m_numberOfElementShadowChildren;
</del><span class="cx">     bool m_insertionPointListIsValid;
</span><span class="cx">     Vector&lt;RefPtr&lt;InsertionPoint&gt; &gt; m_insertionPointList;
</span><span class="cx"> };
</span><span class="lines">@@ -116,7 +101,6 @@
</span><span class="cx">     InsertionPoint* findInsertionPointFor(const Node* key) const;
</span><span class="cx"> 
</span><span class="cx">     void distributeSelectionsTo(InsertionPoint*, const ContentDistribution&amp; pool, Vector&lt;bool&gt;&amp; distributed);
</span><del>-    void distributeNodeChildrenTo(InsertionPoint*, ContainerNode*);
</del><span class="cx"> 
</span><span class="cx">     void invalidateDistribution(Element* host);
</span><span class="cx">     void didShadowBoundaryChange(Element* host);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/testing/Internals.cpp        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -513,25 +513,6 @@
</span><span class="cx">     return frame()-&gt;animation()-&gt;pauseTransitionAtTime(pseudoElement-&gt;renderer(), property, pauseTime);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Internals::hasContentElement(const Node* root, ExceptionCode&amp; ec) const
-{
-    if (root &amp;&amp; root-&gt;isShadowRoot())
-        return ScopeContentDistribution::hasContentElement(toShadowRoot(root));
-
-    ec = INVALID_ACCESS_ERR;
-    return 0;
-}
-
-size_t Internals::countElementShadow(const Node* root, ExceptionCode&amp; ec) const
-{
-    if (!root || !root-&gt;isShadowRoot()) {
-        ec = INVALID_ACCESS_ERR;
-        return 0;
-    }
-
-    return ScopeContentDistribution::countElementShadow(toShadowRoot(root));
-}
-
</del><span class="cx"> bool Internals::attached(Node* node, ExceptionCode&amp; ec)
</span><span class="cx"> {
</span><span class="cx">     if (!node) {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/testing/Internals.h        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -90,8 +90,6 @@
</span><span class="cx">     ShadowRootIfShadowDOMEnabledOrNode* createShadowRoot(Element* host, ExceptionCode&amp;);
</span><span class="cx">     ShadowRootIfShadowDOMEnabledOrNode* shadowRoot(Element* host, ExceptionCode&amp;);
</span><span class="cx">     String shadowRootType(const Node*, ExceptionCode&amp;) const;
</span><del>-    bool hasContentElement(const Node*, ExceptionCode&amp;) const;
-    size_t countElementShadow(const Node*, ExceptionCode&amp;) const;
</del><span class="cx">     Element* includerFor(Node*, ExceptionCode&amp;);
</span><span class="cx">     String shadowPseudoId(Element*, ExceptionCode&amp;);
</span><span class="cx">     void setShadowPseudoId(Element*, const String&amp;, ExceptionCode&amp;);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebCore/testing/Internals.idl        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx">     Node shadowRoot(Element host) raises (DOMException);
</span><span class="cx"> #endif
</span><span class="cx">     DOMString shadowRootType(Node root) raises (DOMException);
</span><del>-    boolean hasContentElement(Node root) raises (DOMException);
-    unsigned long countElementShadow(Node Root) raises (DOMException);
</del><span class="cx">     Element includerFor(Node node) raises (DOMException);
</span><span class="cx">     DOMString shadowPseudoId(Element element) raises (DOMException);
</span><span class="cx">     void setShadowPseudoId(Element element, DOMString id) raises (DOMException);
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (150009 => 150010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in        2013-05-13 14:03:57 UTC (rev 150009)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in        2013-05-13 14:26:27 UTC (rev 150010)
</span><span class="lines">@@ -394,8 +394,6 @@
</span><span class="cx">         ?pseudoElement@Element@WebCore@@QBEPAVPseudoElement@2@W4PseudoId@2@@Z
</span><span class="cx">         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
</span><span class="cx">         ?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
</span><del>-        ?hasContentElement@ScopeContentDistribution@WebCore@@SA_NPBVShadowRoot@2@@Z
-        ?countElementShadow@ScopeContentDistribution@WebCore@@SAIPBVShadowRoot@2@@Z
</del><span class="cx">         ?memoryCache@WebCore@@YAPAVMemoryCache@1@XZ
</span><span class="cx">         ?resourceForURL@MemoryCache@WebCore@@QAEPAVCachedResource@2@ABVKURL@2@@Z
</span><span class="cx">         ?nonFastScrollableRects@Page@WebCore@@QAE?AV?$PassRefPtr@VClientRectList@WebCore@@@WTF@@PBVFrame@2@@Z
</span></span></pre>
</div>
</div>

</body>
</html>