Title: [143606] trunk/Source/WebCore
- Revision
- 143606
- Author
- hy...@apple.com
- Date
- 2013-02-21 08:33:10 -0800 (Thu, 21 Feb 2013)
Log Message
[New Multicolumn] Remove unneeded layout method in RenderMultiColumnFlowThread.
https://bugs.webkit.org/show_bug.cgi?id=110477.
Reviewed by Antti Koivisto.
I forgot that both the sets and the flow thread lay out before the containing
RenderMultiColumnBlock has finished. That means it hasn't computed its overflow yet.
Therefore there is no need to force it to compute its overflow from inside
RenderMultiColumnFlowThread::layout, because the minute RenderMultiColumnFlowThread
finishes its layout, the block will compute its overflow anyway.
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore):
* rendering/RenderMultiColumnFlowThread.h:
(RenderMultiColumnFlowThread):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143605 => 143606)
--- trunk/Source/WebCore/ChangeLog 2013-02-21 16:30:28 UTC (rev 143605)
+++ trunk/Source/WebCore/ChangeLog 2013-02-21 16:33:10 UTC (rev 143606)
@@ -1,3 +1,21 @@
+2013-02-21 David Hyatt <hy...@apple.com>
+
+ [New Multicolumn] Remove unneeded layout method in RenderMultiColumnFlowThread.
+ https://bugs.webkit.org/show_bug.cgi?id=110477.
+
+ Reviewed by Antti Koivisto.
+
+ I forgot that both the sets and the flow thread lay out before the containing
+ RenderMultiColumnBlock has finished. That means it hasn't computed its overflow yet.
+ Therefore there is no need to force it to compute its overflow from inside
+ RenderMultiColumnFlowThread::layout, because the minute RenderMultiColumnFlowThread
+ finishes its layout, the block will compute its overflow anyway.
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore):
+ * rendering/RenderMultiColumnFlowThread.h:
+ (RenderMultiColumnFlowThread):
+
2013-02-21 Martin Robinson <mrobin...@igalia.com>
[GTK] Move feature overriding to the configure phase
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (143605 => 143606)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2013-02-21 16:30:28 UTC (rev 143605)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2013-02-21 16:33:10 UTC (rev 143606)
@@ -51,17 +51,4 @@
computedValues.m_position = logicalTop;
}
-void RenderMultiColumnFlowThread::layout()
-{
- RenderFlowThread::layout();
-
- // Now that flow thread portions have been determined, we may have changed the dimensions of some of our multi-column sets.
- // We need to make the RenderMultiColumnBlock recompute its overflow because some of these sets may be spilling out of the
- // block.
- RenderMultiColumnBlock* colBlock = toRenderMultiColumnBlock(parent());
- if (!colBlock)
- return;
- colBlock->computeOverflow(colBlock->clientLogicalBottom());
}
-
-}
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (143605 => 143606)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2013-02-21 16:30:28 UTC (rev 143605)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2013-02-21 16:33:10 UTC (rev 143606)
@@ -39,8 +39,6 @@
private:
virtual const char* renderName() const OVERRIDE;
virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
-
- virtual void layout() OVERRIDE;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
