Diff
Modified: trunk/Source/WebCore/ChangeLog (118949 => 118950)
--- trunk/Source/WebCore/ChangeLog 2012-05-30 19:08:22 UTC (rev 118949)
+++ trunk/Source/WebCore/ChangeLog 2012-05-30 19:11:09 UTC (rev 118950)
@@ -1,3 +1,23 @@
+2012-05-30 David Hyatt <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=87882
+
+ [New Multicolumn] Rename layoutColumns to relayoutForPagination and make it
+ virtual so that it can be implemented by RenderMultiColumnBlock.
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutBlock):
+ (WebCore::RenderBlock::relayoutForPagination):
+ * rendering/RenderBlock.h:
+ (RenderBlock):
+ * rendering/RenderMultiColumnBlock.cpp:
+ (WebCore::RenderMultiColumnBlock::relayoutForPagination):
+ (WebCore):
+ * rendering/RenderMultiColumnBlock.h:
+ (RenderMultiColumnBlock):
+
2012-05-30 Daniel Drake <[email protected]>
Check for GTK2/GTK3 symbol mismatch earlier
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (118949 => 118950)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-30 19:08:22 UTC (rev 118949)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-30 19:11:09 UTC (rev 118950)
@@ -1478,7 +1478,7 @@
if (lowestFloatLogicalBottom() > (logicalHeight() - toAdd) && expandsToEncloseOverhangingFloats())
setLogicalHeight(lowestFloatLogicalBottom() + toAdd);
- if (layoutColumns(hasSpecifiedPageLogicalHeight, pageLogicalHeight, statePusher))
+ if (relayoutForPagination(hasSpecifiedPageLogicalHeight, pageLogicalHeight, statePusher))
return;
// Calculate our new height.
@@ -5017,7 +5017,7 @@
return LayoutRect(colLogicalTop, colLogicalLeft, colLogicalHeight, colLogicalWidth);
}
-bool RenderBlock::layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer& statePusher)
+bool RenderBlock::relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer& statePusher)
{
if (!hasColumns())
return false;
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (118949 => 118950)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-05-30 19:08:22 UTC (rev 118949)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-05-30 19:11:09 UTC (rev 118950)
@@ -817,7 +817,6 @@
void offsetForContents(LayoutPoint&) const;
virtual void calcColumnWidth();
- bool layoutColumns(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&);
void makeChildrenAnonymousColumnBlocks(RenderObject* beforeChild, RenderBlock* newBlockBox, RenderObject* newChild);
bool expandsToEncloseOverhangingFloats() const;
@@ -933,6 +932,7 @@
protected:
// Pagination routines.
+ virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&);
// Returns the logicalOffset at the top of the next page. If the offset passed in is already at the top of the current page,
// then nextPageLogicalTop with ExcludePageBoundary will still move to the top of the next page. nextPageLogicalTop with
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (118949 => 118950)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-05-30 19:08:22 UTC (rev 118949)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2012-05-30 19:11:09 UTC (rev 118950)
@@ -98,6 +98,12 @@
ensureColumnSets();
}
+bool RenderMultiColumnBlock::relayoutForPagination(bool, LayoutUnit, LayoutStateMaintainer&)
+{
+ // FIXME: Implement.
+ return false;
+}
+
void RenderMultiColumnBlock::addChild(RenderObject* newChild, RenderObject* beforeChild)
{
if (!m_flowThread) {
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h (118949 => 118950)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h 2012-05-30 19:08:22 UTC (rev 118949)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h 2012-05-30 19:11:09 UTC (rev 118950)
@@ -48,8 +48,9 @@
virtual const char* renderName() const;
- virtual bool recomputeLogicalWidth();
+ virtual bool recomputeLogicalWidth() OVERRIDE;
virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) OVERRIDE;
+ virtual bool relayoutForPagination(bool hasSpecifiedPageLogicalHeight, LayoutUnit pageLogicalHeight, LayoutStateMaintainer&) OVERRIDE;
virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
