Changeset 111229 in webkit

Timestamp:

Mar 19, 2012 1:24:14 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.

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.

Source/WebCore:

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/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):

• dom/WebKitNamedFlow.cpp:

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

• dom/WebKitNamedFlow.h:

(WebCore):
(WebKitNamedFlow):
(WebCore::WebKitNamedFlow::unregisterContentNode):

• dom/WebKitNamedFlow.idl:

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/NodeRenderingContext.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitNamedFlow.cpp (modified) (2 diffs)
• Source/WebCore/dom/WebKitNamedFlow.h (modified) (4 diffs)
• Source/WebCore/dom/WebKitNamedFlow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-19  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.
+
+        * fast/regions/webkit-named-flow-content-nodes-expected.txt: Added.
+        * fast/regions/webkit-named-flow-content-nodes.html: Added.
+
 2012-03-19  Xingnan Wang  <xingnan.wang@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  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.
+
+        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/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore::WebKitNamedFlow::contentNodes):
+        (WebCore):
+        (WebCore::WebKitNamedFlow::registerContentNode):
+        * dom/WebKitNamedFlow.h:
+        (WebCore):
+        (WebKitNamedFlow):
+        (WebCore::WebKitNamedFlow::unregisterContentNode):
+        * dom/WebKitNamedFlow.idl:
+
 2012-03-19  Xingnan Wang  <xingnan.wang@intel.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1040 +1040 @@
 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 p(true);
-    if (!p.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(true);
+        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

@@ -67 +67 @@
 #include "Text.h"
 #include "TextIterator.h"
+#include "WebKitAnimationList.h"
 #include "WebKitMutationObserver.h"
-#include "WebKitAnimationList.h"
+#include "WebKitNamedFlow.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
@@ -980 +981 @@
     RenderWidget::suspendWidgetHierarchyUpdates();
 
+    if (document()->cssRegionsEnabled()) {
+        RenderStyle* style = renderer() ? renderer()->style() : computedStyle();
+        if (style && !style->flowThread().isEmpty()) {
+            RefPtr<WebKitNamedFlow> namedFlow = document()->webkitGetFlowByName(style->flowThread(), Document::DoNotCheckFlowNameForInvalidValues);
+            if (namedFlow)
+                namedFlow->unregisterContentNode(this);
+        }
+    }
+
     cancelFocusAppearanceUpdate();
     if (hasRareData())

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -39 +39 @@
 #include "ShadowRoot.h"
 #include "ShadowTree.h"
+#include "WebKitNamedFlow.h"
 
 #if ENABLE(SVG)
@@ -328 +329 @@
     ASSERT(m_node->document()->renderView());
     m_parentFlowRenderer = m_node->document()->renderView()->ensureRenderFlowThreadWithName(m_flowThread);
+    m_parentFlowRenderer->ensureNamedFlow()->registerContentNode(m_node);
 }
 

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -31 +31 @@
 #include "WebKitNamedFlow.h"
 
+#include "Node.h"
+#include "NodeList.h"
 #include "RenderFlowThread.h"
+#include "StaticNodeList.h"
 
 namespace WebCore {
@@ -50 +53 @@
 }
 
+PassRefPtr<NodeList> WebKitNamedFlow::contentNodes() const
+{
+    m_parentFlowThread->document()->updateLayoutIgnorePendingStylesheets();
+
+    Vector<RefPtr<Node> > contentNodes;
+    for (NamedFlowContentNodes::const_iterator it = m_contentNodes.begin(); it != m_contentNodes.end(); ++it) {
+        Node* node = const_cast<Node*>(*it);
+        ASSERT(node->computedStyle()->flowThread() == m_parentFlowThread->flowThread());
+        contentNodes.append(node);
+    }
+
+    return StaticNodeList::adopt(contentNodes);
+}
+
+// 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 orderer.
+void WebKitNamedFlow::registerContentNode(Node* contentNode)
+{
+    ASSERT(contentNode && contentNode->isElementNode());
+
+    // 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);
+}
+
 } // 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 NodeList;
 class RenderFlowThread;
 
@@ -48 +51 @@
 
     bool overflow() const;
+    PassRefPtr<NodeList> contentNodes() const;
+
+    void registerContentNode(Node* contentNode);
+    void unregisterContentNode(Node* contentNode) { m_contentNodes.remove(contentNode); }
 
 private:
@@ -53 +60 @@
 
     RenderFlowThread* m_parentFlowThread;
+
+    typedef ListHashSet<Node*> NamedFlowContentNodes;
+    NamedFlowContentNodes m_contentNodes;
 };
 

trunk/Source/WebCore/dom/WebKitNamedFlow.idl

@@ -33 +33 @@
     ] WebKitNamedFlow {
         readonly attribute boolean overflow;
+        readonly attribute NodeList contentNodes;
     };
 }