Imported WebKit commit 953baa67aa07087b6ecd4199351ec554c724e27d (http://svn.webkit.org/repository/webkit/trunk@122676)

1 files changed, 14 insertions, 1 deletions

diff --git a/Source/WebCore/rendering/FlowThreadController.cpp b/Source/WebCore/rendering/FlowThreadController.cpp
index cf2207ffe..dc9432c76 100644
--- a/Source/WebCore/rendering/FlowThreadController.cpp
+++ b/Source/WebCore/rendering/FlowThreadController.cpp
@@ -33,6 +33,8 @@
 
 #include "RenderFlowThread.h"
 #include "RenderNamedFlowThread.h"
+#include "WebKitNamedFlow.h"
+#include "WebKitNamedFlowCollection.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
@@ -65,7 +67,12 @@ RenderNamedFlowThread* FlowThreadController::ensureRenderFlowThreadWithName(cons
         }
     }
 
-    RenderNamedFlowThread* flowRenderer = new (m_view->renderArena()) RenderNamedFlowThread(m_view->document(), name);
+    WebKitNamedFlowCollection* namedFlows = m_view->document()->namedFlows();
+
+    // Sanity check for the absence of a named flow in the "CREATED" state with the same name.
+    ASSERT(!namedFlows->flowByName(name));
+
+    RenderNamedFlowThread* flowRenderer = new (m_view->renderArena()) RenderNamedFlowThread(m_view->document(), namedFlows->ensureFlowWithName(name));
     flowRenderer->setStyle(RenderFlowThread::createFlowThreadStyle(m_view->style()));
     m_renderNamedFlowThreadList->add(flowRenderer);
 
@@ -122,4 +129,10 @@ void FlowThreadController::unregisterNamedFlowContentNode(Node* contentNode)
     m_mapNamedFlowContentNodes.remove(contentNode);
 }
 
+void FlowThreadController::removeFlowThread(RenderNamedFlowThread* flowThread)
+{
+    m_renderNamedFlowThreadList->remove(flowThread);
+    setIsRenderNamedFlowThreadOrderDirty(true);
+}
+
 } // namespace WebCore