Merge 106694

Source/WebCore/rendering/RenderFlowThread.cpp

 /*
  * Copyright 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 186 matching lines @@
     }
 
     renderRegion->setIsValid(true);
 
     invalidateRegions();
 }
 
 void RenderFlowThread::removeRegionFromThread(RenderRegion* renderRegion)
 {
     ASSERT(renderRegion);
+
     m_regionRangeMap.clear();
     m_regionList.remove(renderRegion);
 
     if (renderRegion->parentFlowThread()) {
         if (!renderRegion->isValid()) {
             renderRegion->parentFlowThread()->m_observerThreadsSet.remove(this);
             // No need to invalidate the regions rectangles. The removed region
             // was not taken into account. Just return here.
             return;
         }
@@ skipping 404 matching lines @@
 }
 
 void RenderFlowThread::removeRenderBoxRegionInfo(RenderBox* box)
 {
     if (!hasRegions())
         return;
 
     RenderRegion* startRegion;
     RenderRegion* endRegion;
     getRegionRangeForBox(box, startRegion, endRegion);
-    
+
     for (RenderRegionList::iterator iter = m_regionList.find(startRegion); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
         if (!region->isValid())
             continue;
         region->removeRenderBoxRegionInfo(box);
         if (region == endRegion)
             break;
     }
-    
+
+#ifndef NDEBUG
+    // We have to make sure we did not left any boxes with region info attached in regions.
+    for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
+        RenderRegion* region = *iter;
+        if (!region->isValid())
+            continue;
+        ASSERT(!region->renderBoxRegionInfo(box));
+    }
+#endif
+
     m_regionRangeMap.remove(box);
 }
 
 bool RenderFlowThread::logicalWidthChangedInRegions(const RenderBlock* block, LayoutUnit offsetFromLogicalTopOfFirstPage)
 {
     if (!hasRegions() || block == this) // Not necessary, since if any region changes, we do a full pagination relayout anyway.
         return false;
 
     RenderRegion* startRegion;
     RenderRegion* endRegion;
@@ skipping 167 matching lines @@
 
 WebKitNamedFlow* RenderFlowThread::ensureNamedFlow()
 {
     if (!m_namedFlow)
         m_namedFlow = WebKitNamedFlow::create();
 
     return m_namedFlow.get();
 }
 
 } // namespace WebCore