Changeset 109313 in webkit

Timestamp:

Feb 29, 2012 10:39:22 PM (12 years ago)

Author:

shinyak@chromium.org

Message:

Refactoring: HTMLContentSelector should be InsertionPoint-aware.
​https://bugs.webkit.org/show_bug.cgi?id=79901

Reviewed by Hajime Morita.

ContentSelectorQuery took HTMLContentElement as argument, but patch changes it to take InsertionPoint instead.
If InsertionPoint is not HTMLContentElement, ContentSelectorQuery will selects the rest of light children.

Now InsertionPoint has pure virtual method 'select'. <shadow> will implement this as a method returning empty string.

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::hasInsertionPoint):

• dom/ShadowRoot.h:

(ShadowRoot):

• dom/ShadowTree.cpp:

(WebCore::ShadowTree::needsReattachHostChildrenAndShadow):
(WebCore::ShadowTree::hostChildrenChanged):

• html/shadow/ContentSelectorQuery.cpp:

(WebCore::ContentSelectorQuery::ContentSelectorQuery):
(WebCore::ContentSelectorQuery::matches):

• html/shadow/ContentSelectorQuery.h:

(WebCore):
(ContentSelectorQuery):

• html/shadow/HTMLContentElement.cpp:

(WebCore::HTMLContentElement::detach):

• html/shadow/HTMLContentElement.h:

(WebCore::toHTMLContentElement):
(WebCore):

• html/shadow/HTMLContentSelector.cpp:

(WebCore::HTMLContentSelector::select):

• html/shadow/HTMLContentSelector.h:

(HTMLContentSelector):

• html/shadow/InsertionPoint.h:

(InsertionPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (1 diff)
• dom/ShadowRoot.h (modified) (1 diff)
• dom/ShadowTree.cpp (modified) (2 diffs)
• html/shadow/ContentSelectorQuery.cpp (modified) (3 diffs)
• html/shadow/ContentSelectorQuery.h (modified) (2 diffs)
• html/shadow/HTMLContentElement.cpp (modified) (1 diff)
• html/shadow/HTMLContentElement.h (modified) (1 diff)
• html/shadow/HTMLContentSelector.cpp (modified) (2 diffs)
• html/shadow/HTMLContentSelector.h (modified) (1 diff)
• html/shadow/InsertionPoint.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  Shinya Kawanaka  <shinyak@chromium.org>
+
+        Refactoring: HTMLContentSelector should be InsertionPoint-aware.
+        https://bugs.webkit.org/show_bug.cgi?id=79901
+
+        Reviewed by Hajime Morita.
+
+        ContentSelectorQuery took HTMLContentElement as argument, but patch changes it to take InsertionPoint instead.
+        If InsertionPoint is not HTMLContentElement, ContentSelectorQuery will selects the rest of light children.
+
+        Now InsertionPoint has pure virtual method 'select'. <shadow> will implement this as a method returning empty string.
+
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::hasInsertionPoint):
+        * dom/ShadowRoot.h:
+        (ShadowRoot):
+        * dom/ShadowTree.cpp:
+        (WebCore::ShadowTree::needsReattachHostChildrenAndShadow):
+        (WebCore::ShadowTree::hostChildrenChanged):
+        * html/shadow/ContentSelectorQuery.cpp:
+        (WebCore::ContentSelectorQuery::ContentSelectorQuery):
+        (WebCore::ContentSelectorQuery::matches):
+        * html/shadow/ContentSelectorQuery.h:
+        (WebCore):
+        (ContentSelectorQuery):
+        * html/shadow/HTMLContentElement.cpp:
+        (WebCore::HTMLContentElement::detach):
+        * html/shadow/HTMLContentElement.h:
+        (WebCore::toHTMLContentElement):
+        (WebCore):
+        * html/shadow/HTMLContentSelector.cpp:
+        (WebCore::HTMLContentSelector::select):
+        * html/shadow/HTMLContentSelector.h:
+        (HTMLContentSelector):
+        * html/shadow/InsertionPoint.h:
+        (InsertionPoint):
+
 2012-02-29  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -179 +179 @@
 }
 
-bool ShadowRoot::hasContentElement() const
+bool ShadowRoot::hasInsertionPoint() const
 {
     for (Node* n = firstChild(); n; n = n->traverseNextNode(this)) {
-        if (n->isContentElement())
+        if (isInsertionPoint(n))
             return true;
     }

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -80 +80 @@
     bool isOldest() const { return !olderShadowRoot(); }
 
-    bool hasContentElement() const;
+    bool hasInsertionPoint() const;
 
 private:

trunk/Source/WebCore/dom/ShadowTree.cpp

@@ -263 +263 @@
 bool ShadowTree::needsReattachHostChildrenAndShadow()
 {
-    return m_needsRecalculateContent || (youngestShadowRoot() && youngestShadowRoot()->hasContentElement());
+    return m_needsRecalculateContent || (youngestShadowRoot() && youngestShadowRoot()->hasInsertionPoint());
 }
 
@@ -270 +270 @@
     ASSERT(youngestShadowRoot());
 
-    if (!youngestShadowRoot()->hasContentElement())
+    if (!youngestShadowRoot()->hasInsertionPoint())
         return;
 

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

@@ -30 +30 @@
 #include "CSSParser.h"
 #include "CSSSelectorList.h"
-#include "HTMLContentElement.h"
+#include "InsertionPoint.h"
 
 namespace WebCore {
 
-ContentSelectorQuery::ContentSelectorQuery(const HTMLContentElement* element)
-    : m_contentElement(element)
-    , m_selectorChecker(element->document(), !element->document()->inQuirksMode())
+ContentSelectorQuery::ContentSelectorQuery(const InsertionPoint* insertionPoint)
+    : m_insertionPoint(insertionPoint)
+    , m_selectorChecker(insertionPoint->document(), !insertionPoint->document()->inQuirksMode())
 {
     m_selectorChecker.setCollectingRulesOnly(true);
 
-    if (element->select().isNull() || element->select().isEmpty()) {
+    if (insertionPoint->select().isNull() || insertionPoint->select().isEmpty()) {
         m_isValidSelector = true;
         return;
@@ -46 +46 @@
 
     CSSParser parser(true);
-    parser.parseSelector(element->select(), element->document(), m_selectorList);
+    parser.parseSelector(insertionPoint->select(), insertionPoint->document(), m_selectorList);
 
     m_isValidSelector = ContentSelectorQuery::validateSelectorList();
@@ -64 +64 @@
         return false;
 
-    ASSERT(node->parentNode() == m_contentElement->shadowTreeRootNode()->shadowHost());
+    ASSERT(node->parentNode() == m_insertionPoint->shadowTreeRootNode()->shadowHost());
 
-    if (m_contentElement->select().isNull() || m_contentElement->select().isEmpty())
+    if (m_insertionPoint->select().isNull() || m_insertionPoint->select().isEmpty())
         return true;
 

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

@@ -42 +42 @@
 class Document;
 class Node;
-class HTMLContentElement;
+class InsertionPoint;
 
 class ContentSelectorQuery {
     WTF_MAKE_NONCOPYABLE(ContentSelectorQuery);
 public:
-    explicit ContentSelectorQuery(const HTMLContentElement*);
+    explicit ContentSelectorQuery(const InsertionPoint*);
 
     bool isValidSelector() const;
@@ -54 +54 @@
     bool validateSelectorList();
 
-    const HTMLContentElement* m_contentElement;
+    const InsertionPoint* m_insertionPoint;
     SelectorDataList m_selectors;
     CSSSelectorList m_selectorList;

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

@@ -95 +95 @@
 
         // When content element is detached, shadow tree should be recreated to re-calculate selector for
-        // other content elements.
+        // other insertion points.
         root->tree()->setNeedsReattachHostChildrenAndShadow();
     }

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

@@ -67 +67 @@
 };
 
+inline const HTMLContentElement* toHTMLContentElement(const Node* node)
+{
+    ASSERT(!node || node->isContentElement());
+    return static_cast<const HTMLContentElement*>(node);
+}
+
 inline HTMLContentElement* toHTMLContentElement(Node* node)
 {

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

@@ -109 +109 @@
 }
 
-void HTMLContentSelector::select(HTMLContentElement* contentElement, HTMLContentSelectionList* selections)
+void HTMLContentSelector::select(InsertionPoint* insertionPoint, HTMLContentSelectionList* selections)
 {
     ASSERT(selections->isEmpty());
 
-    ContentSelectorQuery query(contentElement);
+    ContentSelectorQuery query(insertionPoint);
+
     for (size_t i = 0; i < m_candidates.size(); ++i) {
         Node* child = m_candidates[i].get();
@@ -121 +122 @@
             continue;
 
-        RefPtr<HTMLContentSelection> selection = HTMLContentSelection::create(contentElement, child);
+        RefPtr<HTMLContentSelection> selection = HTMLContentSelection::create(insertionPoint, child);
 
         selections->append(selection);

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

@@ -131 +131 @@
     ~HTMLContentSelector();
 
-    void select(HTMLContentElement*, HTMLContentSelectionList*);
+    void select(InsertionPoint*, HTMLContentSelectionList*);
     void unselect(HTMLContentSelectionList*);
     HTMLContentSelection* findFor(Node* key) const;

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

@@ -34 +34 @@
 #include "HTMLContentSelector.h"
 #include "HTMLElement.h"
+#include <wtf/Forward.h>
 
 namespace WebCore {
@@ -44 +45 @@
     bool hasSelection() const { return m_selections.first(); }
     bool isShadowBoundary() const;
+
+    virtual const AtomicString& select() const = 0;
 
 protected: