Explore the possibility of implementing the CSS Region interface.

Source/core/dom/NamedFlow.cpp

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 13 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/NamedFlow.h"
 
 #include "RuntimeEnabledFeatures.h"
+#include "core/css/CSSRegion.h"
 #include "core/dom/NamedFlowCollection.h"
+#include "core/dom/Range.h"
 #include "core/dom/StaticNodeList.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/events/UIEvent.h"
 #include "core/rendering/RenderNamedFlowThread.h"
 #include "core/rendering/RenderRegion.h"
 
 namespace WebCore {
 
 NamedFlow::NamedFlow(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName)
     : m_flowThreadName(flowThreadName)
@@ skipping 65 matching lines @@
         // http://dev.w3.org/csswg/css-regions/#the-region-interface
         if (renderRegion->isPseudoElement())
             continue;
         countNonPseudoRegions++;
         if (renderRegion->regionOversetState() == RegionEmpty)
             return countNonPseudoRegions;
     }
     return -1;
 }
 
-PassRefPtr<NodeList> NamedFlow::getRegionsByContent(Node* contentNode)
+Vector<RefPtr<CSSRegion>> NamedFlow::getRegionsByContent(Node* contentNode)
 {
-    Vector<RefPtr<Node> > regionNodes;
+    Vector<RefPtr<CSSRegion>> regionObjects;

[Inactive, 2013/10/25 17:51:48]

C++11?

 
     if (!contentNode)
-        return StaticNodeList::adopt(regionNodes);
+        return regionObjects;
 
     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);
+        return regionObjects;
 
     if (inFlowThread(contentNode->renderer(), m_parentFlowThread)) {
         const RenderRegionList& regionList = m_parentFlowThread->renderRegionList();
         for (RenderRegionList::const_iterator iter = regionList.begin(); iter != regionList.end(); ++iter) {
             const RenderRegion* renderRegion = *iter;
             // They will be included when we will properly support the Region interface
             // http://dev.w3.org/csswg/css-regions/#the-region-interface
             if (renderRegion->isPseudoElement())
                 continue;
             if (m_parentFlowThread->objectInFlowRegion(contentNode->renderer(), renderRegion))
-                regionNodes.append(renderRegion->node());
+                regionObjects.append(CSSRegion::create(renderRegion));
         }
     }
 
-    return StaticNodeList::adopt(regionNodes);
+    return regionObjects;
 }
 
-PassRefPtr<NodeList> NamedFlow::getRegions()
+Vector<RefPtr<CSSRegion>> NamedFlow::getRegions()
 {
-    Vector<RefPtr<Node> > regionNodes;
+    Vector<RefPtr<CSSRegion>> regionObjects;
 
     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);
+        return regionObjects;
 
     const RenderRegionList& regionList = m_parentFlowThread->renderRegionList();
     for (RenderRegionList::const_iterator iter = regionList.begin(); iter != regionList.end(); ++iter) {
         const RenderRegion* renderRegion = *iter;
         // They will be included when we will properly support the Region interface
         // http://dev.w3.org/csswg/css-regions/#the-region-interface
         if (renderRegion->isPseudoElement())
             continue;
-        regionNodes.append(renderRegion->node());
+        regionObjects.append(CSSRegion::create(renderRegion));
     }
 
-    return StaticNodeList::adopt(regionNodes);
+    return regionObjects;
 }
 
 PassRefPtr<NodeList> NamedFlow::getContent()
 {
     Vector<RefPtr<Node> > contentNodes;
 
     if (m_flowManager->document())
         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
 
     // The renderer may be destroyed or created after the style update.
@@ skipping 56 matching lines @@
     return m_flowManager->document();
 }
 
 Node* NamedFlow::ownerNode() const
 {
     return m_flowManager->document();
 }
 
 } // namespace WebCore