Title: [113599] branches/subpixellayout/Source/WebCore
- Revision
- 113599
- Author
- [email protected]
- Date
- 2012-04-09 11:34:17 -0700 (Mon, 09 Apr 2012)
Log Message
Remove size_t versions of methods and numeric_limits from FractionalLayoutUnit on branch.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h (113598 => 113599)
--- branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-09 18:29:02 UTC (rev 113598)
+++ branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-09 18:34:17 UTC (rev 113599)
@@ -122,10 +122,6 @@
{
return value <= static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
}
- inline bool isInBounds(size_t value)
- {
- return value <= static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
- }
inline bool isInBounds(double value)
{
return ::abs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
@@ -340,11 +336,6 @@
return FractionalLayoutUnit(a) * b;
}
-inline FractionalLayoutUnit operator*(size_t a, const FractionalLayoutUnit& b)
-{
- return FractionalLayoutUnit(static_cast<unsigned>(a)) * b;
-}
-
inline FractionalLayoutUnit operator*(const int a, const FractionalLayoutUnit& b)
{
return FractionalLayoutUnit(a) * b;
@@ -388,11 +379,6 @@
return a / FractionalLayoutUnit(b);
}
-inline FractionalLayoutUnit operator/(const FractionalLayoutUnit& a, size_t b)
-{
- return a / FractionalLayoutUnit(static_cast<unsigned>(b));
-}
-
inline float operator/(const float a, const FractionalLayoutUnit& b)
{
return a / b.toFloat();
@@ -534,57 +520,4 @@
} // namespace WebCore
-namespace std {
- template<>
- struct numeric_limits<WebCore::FractionalLayoutUnit>
- {
- static const bool is_specialized = true;
-
- static WebCore::FractionalLayoutUnit min() throw()
- { return WebCore::FractionalLayoutUnit::min(); }
- static WebCore::FractionalLayoutUnit max() throw()
- { return WebCore::FractionalLayoutUnit::max(); }
-
- static const int digits = 10;
- static const int digits10 = 10;
- static const bool is_signed = true;
- static const bool is_integer = true;
- static const bool is_exact = true;
- static const int radix = 2;
- static WebCore::FractionalLayoutUnit epsilon() throw()
- { return 0; }
- static WebCore::FractionalLayoutUnit round_error() throw()
- { return 0; }
-
- static const int min_exponent = 0;
- static const int min_exponent10 = 0;
- static const int max_exponent = 0;
- static const int max_exponent10 = 0;
-
- static const bool has_infinity = false;
- static const bool has_quiet_NaN = false;
- static const bool has_signaling_NaN = false;
- static const float_denorm_style has_denorm = denorm_absent;
- static const bool has_denorm_loss = false;
-
- static WebCore::FractionalLayoutUnit infinity() throw()
- { return static_cast<WebCore::FractionalLayoutUnit>(0); }
- static WebCore::FractionalLayoutUnit quiet_NaN() throw()
- { return static_cast<WebCore::FractionalLayoutUnit>(0); }
- static WebCore::FractionalLayoutUnit signaling_NaN() throw()
- { return static_cast<WebCore::FractionalLayoutUnit>(0); }
- static WebCore::FractionalLayoutUnit denorm_min() throw()
- { return static_cast<WebCore::FractionalLayoutUnit>(0); }
-
- static const bool is_iec559 = false;
- static const bool is_bounded = true;
- static const bool is_modulo = true;
-
- static const bool traps = false; //__glibcxx_integral_traps;
- static const bool tinyness_before = false;
- static const float_round_style round_style = round_toward_zero;
-
- };
-}
-
#endif // FractionalLayoutUnit_h
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp (113598 => 113599)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-04-09 18:29:02 UTC (rev 113598)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-04-09 18:34:17 UTC (rev 113599)
@@ -5289,11 +5289,11 @@
ColumnInfo* colInfo = columnInfo();
LayoutUnit logicalLeft = logicalLeftOffsetForContent();
- size_t colCount = columnCount(colInfo);
+ unsigned colCount = columnCount(colInfo);
LayoutUnit colLogicalWidth = colInfo->desiredColumnWidth();
LayoutUnit colLogicalHeight = colInfo->columnHeight();
- for (size_t i = 0; i < colCount; ++i) {
+ for (unsigned i = 0; i < colCount; ++i) {
// Compute the edges for a given column in the block progression direction.
LayoutRect sliceRect = LayoutRect(logicalLeft, borderBefore() + paddingBefore() + i * colLogicalHeight, colLogicalWidth, colLogicalHeight);
if (!isHorizontalWritingMode())
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp (113598 => 113599)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-04-09 18:29:02 UTC (rev 113598)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-04-09 18:34:17 UTC (rev 113599)
@@ -814,7 +814,7 @@
return availableFreeSpace / 2;
if (flexPack == PackDistribute) {
if (availableFreeSpace > 0 && numberOfChildren)
- return availableFreeSpace / (2 * numberOfChildren);
+ return availableFreeSpace / static_cast<unsigned>(2 * numberOfChildren);
if (availableFreeSpace < 0)
return availableFreeSpace / 2;
}
@@ -825,9 +825,9 @@
{
if (availableFreeSpace > 0 && numberOfChildren > 1) {
if (flexPack == PackJustify)
- return availableFreeSpace / (numberOfChildren - 1);
+ return availableFreeSpace / static_cast<unsigned>(numberOfChildren - 1);
if (flexPack == PackDistribute)
- return availableFreeSpace / numberOfChildren;
+ return availableFreeSpace / static_cast<unsigned>(numberOfChildren);
}
return 0;
}
@@ -977,7 +977,7 @@
return availableFreeSpace / 2;
if (linePack == LinePackDistribute) {
if (availableFreeSpace > 0 && numberOfLines)
- return availableFreeSpace / (2 * numberOfLines);
+ return availableFreeSpace / static_cast<unsigned>(2 * numberOfLines);
if (availableFreeSpace < 0)
return availableFreeSpace / 2;
}
@@ -988,9 +988,9 @@
{
if (availableFreeSpace > 0 && numberOfLines > 1) {
if (linePack == LinePackJustify)
- return availableFreeSpace / (numberOfLines - 1);
+ return availableFreeSpace / static_cast<unsigned>(numberOfLines - 1);
if (linePack == LinePackDistribute || linePack == LinePackStretch)
- return availableFreeSpace / numberOfLines;
+ return availableFreeSpace / static_cast<unsigned>(numberOfLines);
}
return 0;
}
@@ -1012,7 +1012,7 @@
adjustAlignmentForChild(child, lineOffset);
if (style()->flexLinePack() == LinePackStretch && availableCrossAxisSpace > 0)
- lineContexts[lineNumber].crossAxisExtent += availableCrossAxisSpace / lineContexts.size();
+ lineContexts[lineNumber].crossAxisExtent += availableCrossAxisSpace / static_cast<unsigned>(lineContexts.size());
lineOffset += linePackingSpaceBetweenChildren(availableCrossAxisSpace, style()->flexLinePack(), lineContexts.size());
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp (113598 => 113599)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-04-09 18:29:02 UTC (rev 113598)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-04-09 18:34:17 UTC (rev 113599)
@@ -472,8 +472,8 @@
setHeight(view()->viewHeight());
}
- size_t cols = frameSet()->totalCols();
- size_t rows = frameSet()->totalRows();
+ unsigned cols = frameSet()->totalCols();
+ unsigned rows = frameSet()->totalRows();
if (m_rows.m_sizes.size() != rows || m_cols.m_sizes.size() != cols) {
m_rows.resize(rows);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
