Changeset 150480 in webkit

Timestamp:

May 21, 2013, 2:38:13 PM (13 years ago)

Author:

Antti Koivisto

Message:

Remove ScopeContentDistribution
​https://bugs.webkit.org/show_bug.cgi?id=116576

Reviewed by Andreas Kling.

With maximum one ShadowRoot per Element this can be smashed into ContentDistributor.

• dom/ShadowRoot.cpp:

(WebCore):

• dom/ShadowRoot.h:

(WebCore):

• html/shadow/ContentDistributor.cpp:

(WebCore::ContentDistributor::ContentDistributor):
(WebCore):
(WebCore::ContentDistributor::~ContentDistributor):
(WebCore::ContentDistributor::invalidateInsertionPointList):
(WebCore::ContentDistributor::ensureInsertionPointList):
(WebCore::ContentDistributor::distribute):
(WebCore::ContentDistributor::invalidate):

• html/shadow/ContentDistributor.h:

(WebCore):
(ContentDistributor):

• html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::InsertionPoint):
(WebCore::InsertionPoint::insertedInto):
(WebCore::InsertionPoint::removedFrom):

Simplify insertion point list invalidation.

• html/shadow/InsertionPoint.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (2 diffs)
• dom/ShadowRoot.h (modified) (3 diffs)
• html/shadow/ContentDistributor.cpp (modified) (5 diffs)
• html/shadow/ContentDistributor.h (modified) (4 diffs)
• html/shadow/InsertionPoint.cpp (modified) (3 diffs)
• html/shadow/InsertionPoint.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-21  Antti Koivisto  <antti@apple.com>
+
+        Remove ScopeContentDistribution
+        https://bugs.webkit.org/show_bug.cgi?id=116576
+
+        Reviewed by Andreas Kling.
+
+        With maximum one ShadowRoot per Element this can be smashed into ContentDistributor.
+
+        * dom/ShadowRoot.cpp:
+        (WebCore):
+        * dom/ShadowRoot.h:
+        (WebCore):
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ContentDistributor::ContentDistributor):
+        (WebCore):
+        (WebCore::ContentDistributor::~ContentDistributor):
+        (WebCore::ContentDistributor::invalidateInsertionPointList):
+        (WebCore::ContentDistributor::ensureInsertionPointList):
+        (WebCore::ContentDistributor::distribute):
+        (WebCore::ContentDistributor::invalidate):
+        * html/shadow/ContentDistributor.h:
+        (WebCore):
+        (ContentDistributor):
+        * html/shadow/InsertionPoint.cpp:
+        (WebCore::InsertionPoint::InsertionPoint):
+        (WebCore::InsertionPoint::insertedInto):
+        (WebCore::InsertionPoint::removedFrom):
+        
+            Simplify insertion point list invalidation.
+
+        * html/shadow/InsertionPoint.h:
+
 2013-05-21  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -40 +40 @@
 
 struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
-    void* pointers[1];
     unsigned countersAndFlags[1];
 };
@@ -197 +196 @@
 }
 
-ScopeContentDistribution* ShadowRoot::ensureScopeDistribution()
-{
-    if (m_scopeDistribution)
-        return m_scopeDistribution.get();
-
-    m_scopeDistribution = adoptPtr(new ScopeContentDistribution);
-    return m_scopeDistribution.get();
-}   
-
 }

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -38 +38 @@
 
 class ElementShadow;
-class ScopeContentDistribution;
 
 class ShadowRoot FINAL : public DocumentFragment, public TreeScope {
@@ -78 +77 @@
     virtual void unregisterScopedHTMLStyleChild() OVERRIDE;
 
-    ScopeContentDistribution* scopeDistribution() { return m_scopeDistribution.get(); }
-    const ScopeContentDistribution* scopeDistribution() const { return m_scopeDistribution.get(); }
-    ScopeContentDistribution* ensureScopeDistribution();
-
     ShadowRootType type() const { return static_cast<ShadowRootType>(m_type); }
 
@@ -99 +94 @@
     bool isOrphan() const { return !host(); }
 
-    OwnPtr<ScopeContentDistribution> m_scopeDistribution;
     unsigned m_numberOfStyles : 28;
     unsigned m_applyAuthorStyles : 1;

trunk/Source/WebCore/html/shadow/ContentDistributor.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-ScopeContentDistribution::ScopeContentDistribution()
+ContentDistributor::ContentDistributor()
     : m_insertionPointListIsValid(true)
+    , m_validity(Undetermined)
 {
 }
 
-void ScopeContentDistribution::invalidateInsertionPointList()
+ContentDistributor::~ContentDistributor()
+{
+}
+
+void ContentDistributor::invalidateInsertionPointList()
 {
     m_insertionPointListIsValid = false;
@@ -47 +52 @@
 }
 
-const Vector<RefPtr<InsertionPoint> >& ScopeContentDistribution::ensureInsertionPointList(ShadowRoot* shadowRoot)
+const Vector<RefPtr<InsertionPoint> >& ContentDistributor::ensureInsertionPointList(ShadowRoot* shadowRoot)
 {
     if (m_insertionPointListIsValid)
@@ -61 +66 @@
 
     return m_insertionPointList;
-}
-
-void ScopeContentDistribution::registerInsertionPoint(InsertionPoint*)
-{
-    invalidateInsertionPointList();
-}
-
-void ScopeContentDistribution::unregisterInsertionPoint(InsertionPoint*)
-{
-    invalidateInsertionPointList();
-}
-
-ContentDistributor::ContentDistributor()
-    : m_validity(Undetermined)
-{
-}
-
-ContentDistributor::~ContentDistributor()
-{
 }
 
@@ -96 +82 @@
 
     if (ShadowRoot* root = host->shadowRoot()) {
-        if (ScopeContentDistribution* scope = root->scopeDistribution()) {
-            const Vector<RefPtr<InsertionPoint> >& insertionPoints = scope->ensureInsertionPointList(root);
-            for (size_t i = 0; i < insertionPoints.size(); ++i) {
-                InsertionPoint* point = insertionPoints[i].get();
-                if (!point->isActive())
-                    continue;
+        const Vector<RefPtr<InsertionPoint> >& insertionPoints = ensureInsertionPointList(root);
+        for (size_t i = 0; i < insertionPoints.size(); ++i) {
+            InsertionPoint* point = insertionPoints[i].get();
+            if (!point->isActive())
+                continue;
 
-                distributeSelectionsTo(point, host);
-            }
+            distributeSelectionsTo(point, host);
         }
     }
@@ -115 +99 @@
 
     if (ShadowRoot* root = host->shadowRoot()) {
-        if (ScopeContentDistribution* scope = root->scopeDistribution()) {
-            const Vector<RefPtr<InsertionPoint> >& insertionPoints = scope->ensureInsertionPointList(root);
-            for (size_t i = 0; i < insertionPoints.size(); ++i) {
-                needsReattach = needsReattach || true;
-                insertionPoints[i]->clearDistribution();
-            }
+        const Vector<RefPtr<InsertionPoint> >& insertionPoints = ensureInsertionPointList(root);
+        for (size_t i = 0; i < insertionPoints.size(); ++i) {
+            needsReattach = true;
+            insertionPoints[i]->clearDistribution();
         }
     }

trunk/Source/WebCore/html/shadow/ContentDistributor.h

@@ -45 +45 @@
 class ShadowRoot;
 
-class ScopeContentDistribution {
-public:
-    ScopeContentDistribution();
-
-    void registerInsertionPoint(InsertionPoint*);
-    void unregisterInsertionPoint(InsertionPoint*);
-
-    void invalidateInsertionPointList();
-    const Vector<RefPtr<InsertionPoint> >& ensureInsertionPointList(ShadowRoot*);
-
-private:
-    bool m_insertionPointListIsValid;
-    Vector<RefPtr<InsertionPoint> > m_insertionPointList;
-};
-
 class ContentDistributor {
     WTF_MAKE_NONCOPYABLE(ContentDistributor);
@@ -73 +58 @@
     ~ContentDistributor();
 
+    void invalidateInsertionPointList();
+    
     InsertionPoint* findInsertionPointFor(const Node* key) const;
 
@@ -83 +70 @@
 
 private:
+    const Vector<RefPtr<InsertionPoint> >& ensureInsertionPointList(ShadowRoot*);
+
     void distribute(Element* host);
     bool invalidate(Element* host);
@@ -91 +80 @@
     bool needsInvalidation() const { return m_validity != Invalidated; }
 
+    Vector<RefPtr<InsertionPoint> > m_insertionPointList;
     HashMap<const Node*, RefPtr<InsertionPoint> > m_nodeToInsertionPoint;
+    bool m_insertionPointListIsValid;
     unsigned m_validity : 2;
 };

trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

@@ -44 +44 @@
 InsertionPoint::InsertionPoint(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document, CreateInsertionPoint)
-    , m_registeredWithShadowRoot(false)
     , m_hasDistribution(false)
 {
@@ -120 +119 @@
         if (ElementShadow* rootOwner = root->owner()) {
             rootOwner->distributor().didShadowBoundaryChange(root->host());
-            if (isActive() && !m_registeredWithShadowRoot && insertionPoint->treeScope()->rootNode() == root) {
-                m_registeredWithShadowRoot = true;
-                root->ensureScopeDistribution()->registerInsertionPoint(this);
-            }
+            rootOwner->distributor().invalidateInsertionPointList();
         }
     }
@@ -138 +134 @@
     // host can be null when removedFrom() is called from ElementShadow destructor.
     ElementShadow* rootOwner = root ? root->owner() : 0;
-    if (rootOwner)
+    if (rootOwner) {
         rootOwner->invalidateDistribution();
+        rootOwner->distributor().invalidateInsertionPointList();
+    }
 
     // Since this insertion point is no longer visible from the shadow subtree, it need to clean itself up.
     clearDistribution();
-
-    if (m_registeredWithShadowRoot && insertionPoint->treeScope()->rootNode() == root) {
-        ASSERT(root);
-        m_registeredWithShadowRoot = false;
-        root->ensureScopeDistribution()->unregisterInsertionPoint(this);
-    }
 
     HTMLElement::removedFrom(insertionPoint);

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -91 +91 @@
 private:
 
-    bool m_registeredWithShadowRoot;
     bool m_hasDistribution;
 };