Changeset 107303 in webkit

Timestamp:

Feb 9, 2012, 4:21:31 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 106694
BUG=112151
Review URL: ​https://chromiumcodereview.appspot.com/9371032

Location:

branches/chromium/1025

Files:

• LayoutTests/fast/regions/flexbox-in-region-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/regions/flexbox-in-region-crash-expected.txt )
• LayoutTests/fast/regions/flexbox-in-region-crash.html (copied) (copied from trunk/LayoutTests/fast/regions/flexbox-in-region-crash.html )
• LayoutTests/fast/regions/select-in-region-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/regions/select-in-region-crash-expected.txt )
• LayoutTests/fast/regions/select-in-region-crash.html (copied) (copied from trunk/LayoutTests/fast/regions/select-in-region-crash.html )
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderRegion.h (modified) (1 diff)

branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp

@@ -1208 +1208 @@
 }
 
+void RenderBlock::computeInitialRegionRangeForBlock()
+{
+    if (inRenderFlowThread()) {
+        // Set our start and end regions. No regions above or below us will be considered by our children. They are
+        // effectively clamped to our region range.
+        LayoutUnit oldHeight =  logicalHeight();
+        LayoutUnit oldLogicalTop = logicalTop();
+        setLogicalHeight(numeric_limits<LayoutUnit>::max() / 2);
+        computeLogicalHeight();
+        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
+        setLogicalHeight(oldHeight);
+        setLogicalTop(oldLogicalTop);
+    }
+}
+
+void RenderBlock::computeRegionRangeForBlock()
+{
+    if (inRenderFlowThread())
+        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
+}
+
 void RenderBlock::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight, BlockLayoutPass layoutPass)
 {
@@ -1267 +1288 @@
     RenderStyle* styleToUse = style();
     LayoutStateMaintainer statePusher(renderView, this, locationOffset(), hasColumns() || hasTransform() || hasReflection() || styleToUse->isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged, colInfo);
-    
+
     if (inRenderFlowThread()) {
         // Regions changing widths can force us to relayout our children.
         if (logicalWidthChangedInRegions())
             relayoutChildren = true;
-    
-        // Set our start and end regions. No regions above or below us will be considered by our children. They are
-        // effectively clamped to our region range.
-        LayoutUnit oldHeight =  logicalHeight();
-        LayoutUnit oldLogicalTop = logicalTop();
-        setLogicalHeight(numeric_limits<LayoutUnit>::max() / 2); 
-        computeLogicalHeight();
-        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
-        setLogicalHeight(oldHeight);
-        setLogicalTop(oldLogicalTop);
-    }
+    }
+    computeInitialRegionRangeForBlock();
 
     // We use four values, maxTopPos, maxTopNeg, maxBottomPos, and maxBottomNeg, to track
@@ -1360 +1372 @@
     bool needAnotherLayoutPass = layoutPositionedObjects(relayoutChildren || isRoot());
 
-    if (inRenderFlowThread())
-        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
+    computeRegionRangeForBlock();
 
     // Add overflow from children (unless we're multi-column, since in that case all our child overflow is clipped anyway).

branches/chromium/1025/Source/WebCore/rendering/RenderBlock.h

@@ -449 +449 @@
 #endif
 
+    void computeInitialRegionRangeForBlock();
+    void computeRegionRangeForBlock();
 private:
     virtual RenderObjectChildList* virtualChildren() { return children(); }
@@ -469 +471 @@
     void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild);
     void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild);
+
     virtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);
     

branches/chromium/1025/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -229 +229 @@
     LayoutStateMaintainer statePusher(view(), this, LayoutSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
+    if (inRenderFlowThread()) {
+        // Regions changing widths can force us to relayout our children.
+        if (logicalWidthChangedInRegions())
+            relayoutChildren = true;
+    }
+    computeInitialRegionRangeForBlock();
+
     LayoutSize previousSize = size();
 
@@ -267 +274 @@
 
     bool needAnotherLayoutPass = layoutPositionedObjects(relayoutChildren || isRoot());
+
+    computeRegionRangeForBlock();
 
     if (!isFloatingOrPositioned() && height() == 0) {

branches/chromium/1025/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -167 +167 @@
     LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
+    if (inRenderFlowThread()) {
+        // Regions changing widths can force us to relayout our children.
+        if (logicalWidthChangedInRegions())
+            relayoutChildren = true;
+    }
+    computeInitialRegionRangeForBlock();
+
     IntSize previousSize = size();
 
@@ -193 +200 @@
 
     layoutPositionedObjects(relayoutChildren || isRoot());
+
+    computeRegionRangeForBlock();
 
     // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.

branches/chromium/1025/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -205 +205 @@
 {
     ASSERT(renderRegion);
+
     m_regionRangeMap.clear();
     m_regionList.remove(renderRegion);
@@ -629 +630 @@
     RenderRegion* endRegion;
     getRegionRangeForBox(box, startRegion, endRegion);
-    
+
     for (RenderRegionList::iterator iter = m_regionList.find(startRegion); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
@@ -638 +639 @@
             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);
 }

branches/chromium/1025/Source/WebCore/rendering/RenderRegion.cpp

@@ -14 +14 @@
  *    provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -48 +48 @@
     , m_isValid(false)
     , m_hasCustomRegionStyle(false)
-#ifndef NDEBUG
-    , m_insideRegionPaint(false)
-#endif
 {
 }
@@ -135 +132 @@
         return;
 
-#ifndef NDEBUG
-    m_insideRegionPaint = true;
-#endif
-
     setRegionBoxesRegionStyle();
     m_flowThread->paintIntoRegion(paintInfo, this, LayoutPoint(paintOffset.x() + borderLeft() + paddingLeft(), paintOffset.y() + borderTop() + paddingTop()));
     restoreRegionBoxesOriginalStyle();
-
-#ifndef NDEBUG
-    m_insideRegionPaint = false;
-#endif
 }
 

branches/chromium/1025/Source/WebCore/rendering/RenderRegion.h

@@ -110 +110 @@
     bool m_isValid;
     bool m_hasCustomRegionStyle;
-
-#ifndef NDEBUG
-    bool m_insideRegionPaint;
-#endif
 };