Changeset 114189 in webkit

Timestamp:

Apr 13, 2012 5:36:10 PM (12 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions]Implement NamedFlow::contentNodes attribute
​https://bugs.webkit.org/show_bug.cgi?id=80134

Reviewed by David Hyatt.

Source/WebCore:

The named flow content nodes collection contains those nodes with webkitFlowInto property set to 'flow'.
In the list, the nodes are placed in document order. Nodes with display:none are also part of the list.
The list of nodes is returned as a static node list.

The content nodes are stored in RenderNamedFlowThread. The content nodes are added to the list in NodeRenderingContext::moveToFlowThreadIfNeeded
and removed from the list in Element::detach. When an element -webkit-flow-into property is changed, the element is detached and attached.
I have also added a bit in NodeFlags to mark that an element is part of a named flow (and the corresponding inNamedFlow/setInNamedFlow/clearInNamedFlow functions).

Test: fast/regions/webkit-named-flow-content-nodes.html

• dom/Document.cpp:

(WebCore::Document::webkitGetFlowByName):

• dom/Document.h:
• dom/Element.cpp:

(WebCore::Element::detach):

• dom/Node.h:

(WebCore::Node::inNamedFlow):
(WebCore::Node::setInNamedFlow):
(WebCore::Node::clearInNamedFlow):
(Node):

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

• dom/WebKitNamedFlow.cpp:

(WebCore::WebKitNamedFlow::contentNodes):
(WebCore):

• dom/WebKitNamedFlow.h:

(WebKitNamedFlow):

• dom/WebKitNamedFlow.idl:
• rendering/FlowThreadController.cpp:

(WebCore::FlowThreadController::registerNamedFlowContentNode):
(WebCore):
(WebCore::FlowThreadController::unregisterNamedFlowContentNode):

• rendering/FlowThreadController.h:

(FlowThreadController):

• rendering/RenderNamedFlowThread.cpp:

(WebCore):
(WebCore::RenderNamedFlowThread::registerNamedFlowContentNode):
(WebCore::RenderNamedFlowThread::unregisterNamedFlowContentNode):

• rendering/RenderNamedFlowThread.h:

(WebCore):
(RenderNamedFlowThread):
(WebCore::RenderNamedFlowThread::contentNodes):
(WebCore::RenderNamedFlowThread::hasContentNode):

LayoutTests:

• fast/regions/webkit-named-flow-content-nodes-expected.txt: Added.
• fast/regions/webkit-named-flow-content-nodes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/webkit-named-flow-content-nodes-expected.txt (added)
• LayoutTests/fast/regions/webkit-named-flow-content-nodes.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)
• Source/WebCore/dom/Node.h (modified) (3 diffs)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.cpp (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.h (modified) (3 diffs)
• Source/WebCore/dom/WebKitNamedFlow.idl (modified) (1 diff)
• Source/WebCore/rendering/FlowThreadController.cpp (modified) (1 diff)
• Source/WebCore/rendering/FlowThreadController.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderNamedFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderNamedFlowThread.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-13  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Implement NamedFlow::contentNodes attribute
+        https://bugs.webkit.org/show_bug.cgi?id=80134
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/webkit-named-flow-content-nodes-expected.txt: Added.
+        * fast/regions/webkit-named-flow-content-nodes.html: Added.
+
 2012-04-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-13  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Implement NamedFlow::contentNodes attribute
+        https://bugs.webkit.org/show_bug.cgi?id=80134
+
+        Reviewed by David Hyatt.
+
+        The named flow content nodes collection contains those nodes with webkitFlowInto property set to 'flow'.
+        In the list, the nodes are placed in document order. Nodes with display:none are also part of the list.
+        The list of nodes is returned as a static node list.
+
+        The content nodes are stored in RenderNamedFlowThread. The content nodes are added to the list in NodeRenderingContext::moveToFlowThreadIfNeeded
+        and removed from the list in Element::detach. When an element -webkit-flow-into property is changed, the element is detached and attached.
+        I have also added a bit in NodeFlags to mark that an element is part of a named flow (and the corresponding inNamedFlow/setInNamedFlow/clearInNamedFlow functions).
+
+        Test: fast/regions/webkit-named-flow-content-nodes.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::webkitGetFlowByName):
+        * dom/Document.h:
+        * dom/Element.cpp:
+        (WebCore::Element::detach):
+        * dom/Node.h:
+        (WebCore::Node::inNamedFlow):
+        (WebCore::Node::setInNamedFlow):
+        (WebCore::Node::clearInNamedFlow):
+        (Node):
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore::WebKitNamedFlow::contentNodes):
+        (WebCore):
+        * dom/WebKitNamedFlow.h:
+        (WebKitNamedFlow):
+        * dom/WebKitNamedFlow.idl:
+        * rendering/FlowThreadController.cpp:
+        (WebCore::FlowThreadController::registerNamedFlowContentNode):
+        (WebCore):
+        (WebCore::FlowThreadController::unregisterNamedFlowContentNode):
+        * rendering/FlowThreadController.h:
+        (FlowThreadController):
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore):
+        (WebCore::RenderNamedFlowThread::registerNamedFlowContentNode):
+        (WebCore::RenderNamedFlowThread::unregisterNamedFlowContentNode):
+        * rendering/RenderNamedFlowThread.h:
+        (WebCore):
+        (RenderNamedFlowThread):
+        (WebCore::RenderNamedFlowThread::contentNodes):
+        (WebCore::RenderNamedFlowThread::hasContentNode):
+
 2012-04-13  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1075 +1075 @@
 PassRefPtr<WebKitNamedFlow> Document::webkitGetFlowByName(const String& flowName)
 {
-    if (!cssRegionsEnabled() || flowName.isEmpty() || !validFlowName(flowName) || !renderer())
+    return webkitGetFlowByName(flowName, CheckFlowNameForInvalidValues);
+}
+
+PassRefPtr<WebKitNamedFlow> Document::webkitGetFlowByName(const String& flowName, FlowNameCheck flowNameCheck)
+{
+    if (!cssRegionsEnabled() || !renderer())
         return 0;
 
-    // Make a slower check for invalid flow name
-    CSSParser parser(CSSStrictMode);
-    if (!parser.parseFlowThread(flowName, this))
-        return 0;
+    if (flowNameCheck == CheckFlowNameForInvalidValues) {
+        if (flowName.isEmpty() || !validFlowName(flowName))
+            return 0;
+
+        // Make a slower check for invalid flow name.
+        CSSParser parser(CSSStrictMode);
+        if (!parser.parseFlowThread(flowName, this))
+            return 0;
+    }
 
     if (RenderView* view = renderer()->view())

trunk/Source/WebCore/dom/Document.h

@@ -353 +353 @@
 
     bool cssRegionsEnabled() const;
+    enum FlowNameCheck {
+        CheckFlowNameForInvalidValues,
+        DoNotCheckFlowNameForInvalidValues
+    };
     PassRefPtr<WebKitNamedFlow> webkitGetFlowByName(const String&);
+    PassRefPtr<WebKitNamedFlow> webkitGetFlowByName(const String&, FlowNameCheck);
 
     bool regionBasedColumnsEnabled() const;

trunk/Source/WebCore/dom/Element.cpp

@@ -41 +41 @@
 #include "ElementRareData.h"
 #include "ExceptionCode.h"
+#include "FlowThreadController.h"
 #include "FocusController.h"
 #include "Frame.h"
@@ -983 +984 @@
     RenderWidget::suspendWidgetHierarchyUpdates();
 
+    if (document()->cssRegionsEnabled() && inNamedFlow()) {
+        if (document()->renderer() && document()->renderer()->view())
+            document()->renderer()->view()->flowThreadController()->unregisterNamedFlowContentNode(this);
+    }
+
     cancelFocusAppearanceUpdate();
     if (hasRareData())

trunk/Source/WebCore/dom/Node.h

@@ -216 +216 @@
     bool isDocumentNode() const;
     bool isShadowRoot() const { return getFlag(IsShadowRootFlag); }
+    bool inNamedFlow() const { return getFlag(InNamedFlowFlag); }
 
     Node* shadowAncestorNode() const;
@@ -324 +325 @@
     void setIsLink() { setFlag(IsLinkFlag); }
     void clearIsLink() { clearFlag(IsLinkFlag); }
+
+    void setInNamedFlow() { setFlag(InNamedFlowFlag); }
+    void clearInNamedFlow() { clearFlag(InNamedFlowFlag); }
 
     enum ShouldSetAttached {
@@ -666 +670 @@
 
 #if ENABLE(SVG)
-        DefaultNodeFlags = IsParsingChildrenFinishedFlag | IsStyleAttributeValidFlag | AreSVGAttributesValidFlag
+        DefaultNodeFlags = IsParsingChildrenFinishedFlag | IsStyleAttributeValidFlag | AreSVGAttributesValidFlag,
 #else
-        DefaultNodeFlags = IsParsingChildrenFinishedFlag | IsStyleAttributeValidFlag
-#endif
+        DefaultNodeFlags = IsParsingChildrenFinishedFlag | IsStyleAttributeValidFlag,
+#endif
+        InNamedFlowFlag = 1 << 29
     };
 

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -328 +328 @@
     m_flowThread = m_style->flowThread();
     ASSERT(m_node->document()->renderView());
-    m_parentFlowRenderer = m_node->document()->renderView()->flowThreadController()->ensureRenderFlowThreadWithName(m_flowThread);
+    FlowThreadController* flowThreadController = m_node->document()->renderView()->flowThreadController();
+    m_parentFlowRenderer = flowThreadController->ensureRenderFlowThreadWithName(m_flowThread);
+    flowThreadController->registerNamedFlowContentNode(m_node, m_parentFlowRenderer);
 }
 

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -75 +75 @@
 }
 
+PassRefPtr<NodeList> WebKitNamedFlow::contentNodes() const
+{
+    m_parentFlowThread->document()->updateLayoutIgnorePendingStylesheets();
+
+    Vector<RefPtr<Node> > contentNodes;
+    for (NamedFlowContentNodes::const_iterator it = m_parentFlowThread->contentNodes().begin(); it != m_parentFlowThread->contentNodes().end(); ++it) {
+        Node* node = const_cast<Node*>(*it);
+        ASSERT(node->computedStyle()->flowThread() == m_parentFlowThread->flowThreadName());
+        contentNodes.append(node);
+    }
+
+    return StaticNodeList::adopt(contentNodes);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/WebKitNamedFlow.h

@@ -31 +31 @@
 #define WebKitNamedFlow_h
 
+#include <Node.h>
+#include <wtf/ListHashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
@@ -36 +38 @@
 namespace WebCore {
 
-class Node;
 class NodeList;
 class RenderNamedFlowThread;
@@ -51 +52 @@
     bool overflow() const;
     PassRefPtr<NodeList> getRegionsByContentNode(Node*);
+    PassRefPtr<NodeList> contentNodes() const;
 
 private:

trunk/Source/WebCore/dom/WebKitNamedFlow.idl

@@ -34 +34 @@
         readonly attribute boolean overflow;
         NodeList getRegionsByContentNode(in Node contentNode);
+        readonly attribute NodeList contentNodes;
     };
 }

trunk/Source/WebCore/rendering/FlowThreadController.cpp

@@ -102 +102 @@
 }
 
+void FlowThreadController::registerNamedFlowContentNode(Node* contentNode, RenderNamedFlowThread* namedFlow)
+{
+    ASSERT(contentNode && contentNode->isElementNode());
+    ASSERT(namedFlow);
+    ASSERT(!m_mapNamedFlowContentNodes.contains(contentNode));
+    ASSERT(!namedFlow->hasContentNode(contentNode));
+    m_mapNamedFlowContentNodes.add(contentNode, namedFlow);
+    namedFlow->registerNamedFlowContentNode(contentNode);
+}
+
+void FlowThreadController::unregisterNamedFlowContentNode(Node* contentNode)
+{
+    ASSERT(contentNode && contentNode->isElementNode());
+    HashMap<Node*, RenderNamedFlowThread*>::iterator it = m_mapNamedFlowContentNodes.find(contentNode);
+    ASSERT(it != m_mapNamedFlowContentNodes.end());
+    ASSERT(it->second);
+    ASSERT(it->second->hasContentNode(contentNode));
+    it->second->unregisterNamedFlowContentNode(contentNode);
+    m_mapNamedFlowContentNodes.remove(contentNode);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/FlowThreadController.h

@@ -63 +63 @@
     void layoutRenderNamedFlowThreads();
 
+    void registerNamedFlowContentNode(Node*, RenderNamedFlowThread*);
+    void unregisterNamedFlowContentNode(Node*);
+
 protected:
     FlowThreadController(RenderView*);
@@ -71 +74 @@
     bool m_isRenderNamedFlowThreadOrderDirty;
     OwnPtr<RenderNamedFlowThreadList> m_renderNamedFlowThreadList;
+    // maps a content node to its render flow thread.
+    HashMap<Node*, RenderNamedFlowThread*> m_mapNamedFlowContentNodes;
 };
 

trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

@@ -254 +254 @@
 }
 
-}
+// The content nodes list contains those nodes with -webkit-flow-into: flow.
+// An element with display:none should also be listed among those nodes.
+// The list of nodes is ordered.
+void RenderNamedFlowThread::registerNamedFlowContentNode(Node* contentNode)
+{
+    ASSERT(contentNode && contentNode->isElementNode());
+
+    contentNode->setInNamedFlow();
+
+    // Find the first content node following the new content node.
+    for (NamedFlowContentNodes::iterator it = m_contentNodes.begin(); it != m_contentNodes.end(); ++it) {
+        Node* node = *it;
+        unsigned short position = contentNode->compareDocumentPosition(node);
+        if (position & Node::DOCUMENT_POSITION_FOLLOWING) {
+            m_contentNodes.insertBefore(node, contentNode);
+            return;
+        }
+    }
+    m_contentNodes.add(contentNode);
+}
+
+void RenderNamedFlowThread::unregisterNamedFlowContentNode(Node* contentNode)
+{
+    ASSERT(contentNode && contentNode->isElementNode());
+    ASSERT(m_contentNodes.contains(contentNode));
+    ASSERT(contentNode->inNamedFlow());
+
+    contentNode->clearInNamedFlow();
+    m_contentNodes.remove(contentNode);
+
+}
+
+}

trunk/Source/WebCore/rendering/RenderNamedFlowThread.h

@@ -35 +35 @@
 namespace WebCore {
 
+class Node;
 class RenderNamedFlowThread;
 class WebKitNamedFlow;
@@ -40 +41 @@
 typedef ListHashSet<RenderNamedFlowThread*> RenderNamedFlowThreadList;
 typedef HashCountedSet<RenderNamedFlowThread*> RenderNamedFlowThreadCountedSet;
+typedef ListHashSet<Node*> NamedFlowContentNodes;
 
 class RenderNamedFlowThread : public RenderFlowThread {
@@ -63 +65 @@
 
     WebKitNamedFlow* ensureNamedFlow();
+    void registerNamedFlowContentNode(Node*);
+    void unregisterNamedFlowContentNode(Node*);
+    const NamedFlowContentNodes& contentNodes() const { return m_contentNodes; }
+    bool hasContentNode(Node* contentNode) const { ASSERT(contentNode); return m_contentNodes.contains(contentNode); }
 
 private:
@@ -91 +97 @@
     FlowThreadChildList m_flowThreadChildList;
 
+    NamedFlowContentNodes m_contentNodes;
+
     // The DOM Object that represents a named flow.
     RefPtr<WebKitNamedFlow> m_namedFlow;