Revert 105784 - Merge 104121 - Source/WebCore: Crash in RenderRegion::getRegionRangeForBox.

Source/WebCore/rendering/RenderFlowThread.cpp

Index: Source/WebCore/rendering/RenderFlowThread.cpp
===================================================================
--- Source/WebCore/rendering/RenderFlowThread.cpp	(revision 105814)
+++ Source/WebCore/rendering/RenderFlowThread.cpp	(working copy)
@@ -209,9 +209,7 @@
 void RenderFlowThread::removeRegionFromThread(RenderRegion* renderRegion)
 {
     ASSERT(renderRegion);
-    clearRenderRegionRangeMap();
     m_regionList.remove(renderRegion);
-
     if (renderRegion->parentFlowThread()) {
         if (!renderRegion->isValid()) {
             renderRegion->parentFlowThread()->m_observerThreadsSet.remove(this);
@@ -501,7 +499,7 @@
 
 void RenderFlowThread::repaintRectangleInRegions(const LayoutRect& repaintRect, bool immediate)
 {
-    if (!shouldRepaint(repaintRect) || !hasValidRegionInfo())
+    if (!shouldRepaint(repaintRect))
         return;
 
     for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
@@ -595,7 +593,7 @@
 
 RenderRegion* RenderFlowThread::mapFromFlowToRegion(TransformState& transformState) const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
 
     LayoutRect boxRect = transformState.mappedQuad().enclosingBoundingBox();
@@ -676,7 +674,7 @@
 
 LayoutUnit RenderFlowThread::contentLogicalWidthOfFirstRegion() const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
     for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
@@ -690,7 +688,7 @@
 
 LayoutUnit RenderFlowThread::contentLogicalHeightOfFirstRegion() const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
     for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
@@ -704,7 +702,7 @@
  
 LayoutUnit RenderFlowThread::contentLogicalLeftOfFirstRegion() const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
     for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
@@ -718,7 +716,7 @@
 
 RenderRegion* RenderFlowThread::firstRegion() const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
     for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
@@ -731,7 +729,7 @@
 
 RenderRegion* RenderFlowThread::lastRegion() const
 {
-    if (!hasValidRegionInfo())
+    if (!hasValidRegions())
         return 0;
     for (RenderRegionList::const_reverse_iterator iter = m_regionList.rbegin(); iter != m_regionList.rend(); ++iter) {
         RenderRegion* region = *iter;
@@ -781,10 +779,8 @@
     RenderRegionRange* range = m_regionRangeMap.get(box);
     if (!range)
         return;
-
     startRegion = range->startRegion();
     endRegion = range->endRegion();
-    ASSERT(m_regionList.contains(startRegion) && m_regionList.contains(endRegion));
 }
     
 } // namespace WebCore