Diff
Modified: branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h (114513 => 114514)
--- branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-18 16:25:40 UTC (rev 114513)
+++ branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-04-18 16:28:12 UTC (rev 114514)
@@ -36,10 +36,6 @@
#include <math.h>
#include <stdlib.h>
-#if PLATFORM(CHROMIUM) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT)
-#define LAYOUT_UNIT_SIZE_T
-#endif
-
namespace WebCore {
static const int kFixedPointDenominator = 60;
@@ -55,9 +51,6 @@
FractionalLayoutUnit(float value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
FractionalLayoutUnit(double value) { ASSERT(isInBounds(value)); m_value = value * kFixedPointDenominator; }
FractionalLayoutUnit(const FractionalLayoutUnit& value) { m_value = value.rawValue(); }
-#ifdef LAYOUT_UNIT_SIZE_T
- FractionalLayoutUnit(size_t value) { ASSERT(isInBounds(value)); m_value = static_cast<int>(value * kFixedPointDenominator); }
-#endif
inline int toInt() const { return m_value / kFixedPointDenominator; }
inline unsigned toUnsigned() const { ASSERT(m_value >= 0); return toInt(); }
@@ -133,12 +126,6 @@
{
return ::fabs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
}
-#ifdef LAYOUT_UNIT_SIZE_T
- inline bool isInBounds(size_t value)
- {
- return value <= static_cast<size_t>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
- }
-#endif
int m_value;
};
@@ -344,13 +331,6 @@
return a * FractionalLayoutUnit(b);
}
-#ifdef LAYOUT_UNIT_SIZE_T
-inline FractionalLayoutUnit operator*(const FractionalLayoutUnit& a, size_t b)
-{
- return a * FractionalLayoutUnit(b);
-}
-#endif
-
inline FractionalLayoutUnit operator*(unsigned a, const FractionalLayoutUnit& b)
{
return FractionalLayoutUnit(a) * b;
@@ -371,13 +351,6 @@
return a * b.toDouble();
}
-#ifdef LAYOUT_UNIT_SIZE_T
-inline FractionalLayoutUnit operator*(size_t a, const FractionalLayoutUnit& b)
-{
- return FractionalLayoutUnit(a) * b;
-}
-#endif
-
inline FractionalLayoutUnit operator/(const FractionalLayoutUnit& a, const FractionalLayoutUnit& b)
{
FractionalLayoutUnit returnVal;
@@ -406,13 +379,6 @@
return a / FractionalLayoutUnit(b);
}
-#ifdef LAYOUT_UNIT_SIZE_T
-inline FractionalLayoutUnit operator/(const FractionalLayoutUnit& a, size_t b)
-{
- return a / FractionalLayoutUnit(b);
-}
-#endif
-
inline float operator/(const float a, const FractionalLayoutUnit& b)
{
return a / b.toFloat();
@@ -433,13 +399,6 @@
return FractionalLayoutUnit(a) / b;
}
-#ifdef LAYOUT_UNIT_SIZE_T
-inline FractionalLayoutUnit operator/(size_t a, const FractionalLayoutUnit& b)
-{
- return FractionalLayoutUnit(a) / b;
-}
-#endif
-
inline FractionalLayoutUnit operator+(const FractionalLayoutUnit& a, const FractionalLayoutUnit& b)
{
FractionalLayoutUnit returnVal;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp (114513 => 114514)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-04-18 16:25:40 UTC (rev 114513)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-04-18 16:28:12 UTC (rev 114514)
@@ -5176,11 +5176,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 (114513 => 114514)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-04-18 16:25:40 UTC (rev 114513)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-04-18 16:28:12 UTC (rev 114514)
@@ -806,7 +806,7 @@
return !totalViolation;
}
-static LayoutUnit initialPackingOffset(LayoutUnit availableFreeSpace, EFlexPack flexPack, size_t numberOfChildren)
+static LayoutUnit initialPackingOffset(LayoutUnit availableFreeSpace, EFlexPack flexPack, unsigned numberOfChildren)
{
if (flexPack == PackEnd)
return availableFreeSpace;
@@ -821,7 +821,7 @@
return 0;
}
-static LayoutUnit packingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexPack flexPack, size_t numberOfChildren)
+static LayoutUnit packingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexPack flexPack, unsigned numberOfChildren)
{
if (availableFreeSpace > 0 && numberOfChildren > 1) {
if (flexPack == PackJustify)
@@ -969,7 +969,7 @@
}
}
-static LayoutUnit initialLinePackingOffset(LayoutUnit availableFreeSpace, EFlexLinePack linePack, size_t numberOfLines)
+static LayoutUnit initialLinePackingOffset(LayoutUnit availableFreeSpace, EFlexLinePack linePack, unsigned numberOfLines)
{
if (linePack == LinePackEnd)
return availableFreeSpace;
@@ -984,7 +984,7 @@
return 0;
}
-static LayoutUnit linePackingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexLinePack linePack, size_t numberOfLines)
+static LayoutUnit linePackingSpaceBetweenChildren(LayoutUnit availableFreeSpace, EFlexLinePack linePack, unsigned numberOfLines)
{
if (availableFreeSpace > 0 && numberOfLines > 1) {
if (linePack == LinePackJustify)
@@ -1006,13 +1006,13 @@
RenderBox* child = iterator.first();
LayoutUnit lineOffset = initialLinePackingOffset(availableCrossAxisSpace, style()->flexLinePack(), lineContexts.size());
- for (size_t lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {
+ for (unsigned lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {
lineContexts[lineNumber].crossAxisOffset += lineOffset;
for (size_t childNumber = 0; childNumber < lineContexts[lineNumber].numberOfChildren; ++childNumber, child = iterator.next())
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 (114513 => 114514)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-04-18 16:25:40 UTC (rev 114513)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-04-18 16:28:12 UTC (rev 114514)
@@ -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);
