Changeset 124772 in webkit

Timestamp:

Aug 6, 2012, 8:24:17 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] Add the NamedFlow.getRegions() API
​https://bugs.webkit.org/show_bug.cgi?id=93240

Patch by Andrei Bucur <​abucur@adobe.com> on 2012-08-06
Reviewed by Andreas Kling.

Source/WebCore:

This patch adds the NamedFlow.getRegions() API call as specified by ​http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-named-flow .
For now, WebKit supports only one type of regions, Element. The Region interface will be introduced when other interfaces will be capable
of becoming regions.

New test: fast/regions/webkit-named-flow-get-regions.html

• dom/WebKitNamedFlow.cpp:

(WebCore::WebKitNamedFlow::getRegionsByContent): Add a check not to include the pseudo-elements that are regions; those don't have a node attached.
(WebCore::WebKitNamedFlow::getRegions):
(WebCore):

• dom/WebKitNamedFlow.h:

(WebKitNamedFlow):

• dom/WebKitNamedFlow.idl:

LayoutTests:

Link to spec: ​http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-named-flow
The test also verifies the regions are returned in document order.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/webkit-named-flow-get-regions-expected.txt (added)
• LayoutTests/fast/regions/webkit-named-flow-get-regions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.cpp (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.h (modified) (1 diff)
• Source/WebCore/dom/WebKitNamedFlow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-06  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Add the NamedFlow.getRegions() API
+        https://bugs.webkit.org/show_bug.cgi?id=93240
+
+        Reviewed by Andreas Kling.
+
+        Link to spec: http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-named-flow
+        The test also verifies the regions are returned in document order.
+
+        * fast/regions/webkit-named-flow-get-regions-expected.txt: Added.
+        * fast/regions/webkit-named-flow-get-regions.html: Added.
+
 2012-08-06  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-06  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Add the NamedFlow.getRegions() API
+        https://bugs.webkit.org/show_bug.cgi?id=93240
+
+        Reviewed by Andreas Kling.
+
+        This patch adds the NamedFlow.getRegions() API call as specified by http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-named-flow .
+        For now, WebKit supports only one type of regions, Element. The Region interface will be introduced when other interfaces will be capable
+        of becoming regions.
+
+        New test: fast/regions/webkit-named-flow-get-regions.html
+
+        * dom/WebKitNamedFlow.cpp:
+        (WebCore::WebKitNamedFlow::getRegionsByContent): Add a check not to include the pseudo-elements that are regions; those don't have a node attached.
+        (WebCore::WebKitNamedFlow::getRegions):
+        (WebCore):
+        * dom/WebKitNamedFlow.h:
+        (WebKitNamedFlow):
+        * dom/WebKitNamedFlow.idl:
+
 2012-08-06  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/dom/WebKitNamedFlow.cpp

@@ -118 +118 @@
         for (RenderRegionList::const_iterator iter = regionList.begin(); iter != regionList.end(); ++iter) {
             const RenderRegion* renderRegion = *iter;
-            if (!renderRegion->isValid())
+            // FIXME: Pseudo-elements are not included in the list
+            if (!renderRegion->isValid() || !renderRegion->node())
                 continue;
             if (m_parentFlowThread->objectInFlowRegion(contentNode->renderer(), renderRegion))
                 regionNodes.append(renderRegion->node());
         }
+    }
+
+    return StaticNodeList::adopt(regionNodes);
+}
+
+PassRefPtr<NodeList> WebKitNamedFlow::getRegions()
+{
+    Vector<RefPtr<Node> > regionNodes;
+
+    if (m_flowManager->document())
+        m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
+
+    // The renderer may be destroyed or created after the style update.
+    // Because this is called from JS, where the wrapper keeps a reference to the NamedFlow, no guard is necessary.
+    if (!m_parentFlowThread)
+        return StaticNodeList::adopt(regionNodes);
+
+    const RenderRegionList& regionList = m_parentFlowThread->renderRegionList();
+    for (RenderRegionList::const_iterator iter = regionList.begin(); iter != regionList.end(); ++iter) {
+        const RenderRegion* renderRegion = *iter;
+        // FIXME: Pseudo-elements are not included in the list
+        if (!renderRegion->isValid() || !renderRegion->node())
+            continue;
+        regionNodes.append(renderRegion->node());
     }
 

trunk/Source/WebCore/dom/WebKitNamedFlow.h

@@ -57 +57 @@
     int firstEmptyRegionIndex() const;
     PassRefPtr<NodeList> getRegionsByContent(Node*);
+    PassRefPtr<NodeList> getRegions();
     PassRefPtr<NodeList> getContent();
 

trunk/Source/WebCore/dom/WebKitNamedFlow.idl

@@ -38 +38 @@
         readonly attribute long firstEmptyRegionIndex;
         NodeList getRegionsByContent(in Node contentNode);
+        NodeList getRegions();
         NodeList getContent();