Title: [159028] trunk/Source/WebCore
- Revision
- 159028
- Author
- [email protected]
- Date
- 2013-11-10 11:50:07 -0800 (Sun, 10 Nov 2013)
Log Message
Fix build.
* rendering/RenderMultiColumnBlock.cpp:
(WebCore::RenderMultiColumnBlock::computeColumnCountAndWidth):
(WebCore::RenderMultiColumnBlock::checkForPaginationLogicalHeightChange):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (159027 => 159028)
--- trunk/Source/WebCore/ChangeLog 2013-11-10 19:32:33 UTC (rev 159027)
+++ trunk/Source/WebCore/ChangeLog 2013-11-10 19:50:07 UTC (rev 159028)
@@ -1,5 +1,13 @@
2013-11-10 Anders Carlsson <[email protected]>
+ Fix build.
+
+ * rendering/RenderMultiColumnBlock.cpp:
+ (WebCore::RenderMultiColumnBlock::computeColumnCountAndWidth):
+ (WebCore::RenderMultiColumnBlock::checkForPaginationLogicalHeightChange):
+
+2013-11-10 Anders Carlsson <[email protected]>
+
Remove all 'std' using directives from WebCore
https://bugs.webkit.org/show_bug.cgi?id=124125
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (159027 => 159028)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2013-11-10 19:32:33 UTC (rev 159027)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2013-11-10 19:50:07 UTC (rev 159028)
@@ -61,17 +61,17 @@
LayoutUnit availWidth = m_columnWidth;
LayoutUnit colGap = columnGap();
- LayoutUnit colWidth = max<LayoutUnit>(1, LayoutUnit(style().columnWidth()));
- int colCount = max<int>(1, style().columnCount());
+ LayoutUnit colWidth = std::max<LayoutUnit>(1, LayoutUnit(style().columnWidth()));
+ int colCount = std::max<int>(1, style().columnCount());
if (style().hasAutoColumnWidth() && !style().hasAutoColumnCount()) {
m_columnCount = colCount;
- m_columnWidth = max<LayoutUnit>(0, (availWidth - ((m_columnCount - 1) * colGap)) / m_columnCount);
+ m_columnWidth = std::max<LayoutUnit>(0, (availWidth - ((m_columnCount - 1) * colGap)) / m_columnCount);
} else if (!style().hasAutoColumnWidth() && style().hasAutoColumnCount()) {
- m_columnCount = max<LayoutUnit>(1, (availWidth + colGap) / (colWidth + colGap));
+ m_columnCount = std::max<LayoutUnit>(1, (availWidth + colGap) / (colWidth + colGap));
m_columnWidth = ((availWidth + colGap) / m_columnCount) - colGap;
} else {
- m_columnCount = max<LayoutUnit>(min<LayoutUnit>(colCount, (availWidth + colGap) / (colWidth + colGap)), 1);
+ m_columnCount = std::max<LayoutUnit>(std::min<LayoutUnit>(colCount, (availWidth + colGap) / (colWidth + colGap)), 1);
m_columnWidth = ((availWidth + colGap) / m_columnCount) - colGap;
}
}
@@ -90,7 +90,7 @@
{
// We don't actually update any of the variables. We just subclassed to adjust our column height.
updateLogicalHeight();
- m_columnHeightAvailable = max<LayoutUnit>(contentLogicalHeight(), 0);
+ m_columnHeightAvailable = std::max<LayoutUnit>(contentLogicalHeight(), 0);
setLogicalHeight(0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
