Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 17 insertions, 3 deletions

diff --git a/Source/WebCore/rendering/FlowThreadController.cpp b/Source/WebCore/rendering/FlowThreadController.cpp
index cb4bdb1f2..3759a43e1 100644
--- a/Source/WebCore/rendering/FlowThreadController.cpp
+++ b/Source/WebCore/rendering/FlowThreadController.cpp
@@ -153,9 +153,9 @@ 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);
+    ASSERT(it->value);
+    ASSERT(it->value->hasContentNode(contentNode));
+    it->value->unregisterNamedFlowContentNode(contentNode);
     m_mapNamedFlowContentNodes.remove(contentNode);
 }
 
@@ -176,4 +176,18 @@ bool FlowThreadController::isAutoLogicalHeightRegionsFlagConsistent() const
 }
 #endif
 
+void FlowThreadController::resetRegionsOverrideLogicalContentHeight()
+{
+    ASSERT(m_view->normalLayoutPhase());
+    for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList->begin(); iter != m_renderNamedFlowThreadList->end(); ++iter)
+        (*iter)->resetRegionsOverrideLogicalContentHeight();
+}
+
+void FlowThreadController::markAutoLogicalHeightRegionsForLayout()
+{
+    ASSERT(m_view->constrainedFlowThreadsLayoutPhase());
+    for (RenderNamedFlowThreadList::iterator iter = m_renderNamedFlowThreadList->begin(); iter != m_renderNamedFlowThreadList->end(); ++iter)
+        (*iter)->markAutoLogicalHeightRegionsForLayout();
+}
+
 } // namespace WebCore