Modified: branches/subpixellayout/Source/WebCore/html/ValidationMessage.cpp (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/html/ValidationMessage.cpp 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/html/ValidationMessage.cpp 2012-02-14 02:17:08 UTC (rev 107654)
@@ -115,8 +115,8 @@
double hostY = hostRect.y();
if (RenderBox* container = bubble->renderer()->containingBlock()) {
FloatPoint containerLocation = container->localToAbsolute();
- hostX -= containerLocation.x() + container->borderLeft().toFloat();
- hostY -= containerLocation.y() + container->borderTop().toFloat();
+ hostX -= containerLocation.x() + container->borderLeft();
+ hostY -= containerLocation.y() + container->borderTop();
}
StylePropertySet* style = bubble->ensureInlineStyleDecl();
Modified: branches/subpixellayout/Source/WebCore/html/shadow/SliderThumbElement.cpp (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-02-14 02:17:08 UTC (rev 107654)
@@ -160,7 +160,7 @@
Node* track = node()->firstChild();
if (track && track->renderer()->isBox()) {
RenderBox* trackBox = track->renderBox();
- trackBox->style()->setHeight(Length((trackBox->height() - trackBox->borderAndPaddingHeight()).toFloat(), Fixed));
+ trackBox->style()->setHeight(Length((trackBox->height() - trackBox->borderAndPaddingHeight()), Fixed));
}
}
Modified: branches/subpixellayout/Source/WebCore/page/SpatialNavigation.cpp (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/page/SpatialNavigation.cpp 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/page/SpatialNavigation.cpp 2012-02-14 02:17:08 UTC (rev 107654)
@@ -664,8 +664,8 @@
return;
}
- float x = (entryPoint.x() - exitPoint.x()).toFloat() * (entryPoint.x() - exitPoint.x()).toFloat();
- float y = (entryPoint.y() - exitPoint.y()).toFloat() * (entryPoint.y() - exitPoint.y()).toFloat();
+ float x = (entryPoint.x() - exitPoint.x()) * (entryPoint.x() - exitPoint.x());
+ float y = (entryPoint.y() - exitPoint.y()) * (entryPoint.y() - exitPoint.y());
float euclidianDistance = sqrt(x + y);
Modified: branches/subpixellayout/Source/WebCore/platform/Length.h (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/platform/Length.h 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/platform/Length.h 2012-02-14 02:17:08 UTC (rev 107654)
@@ -125,6 +125,13 @@
m_isFloat = true;
}
+ void setValue(LengthType t, AppUnit value)
+ {
+ m_type = t;
+ m_floatValue = value;
+ m_isFloat = true;
+ }
+
void setValue(float value)
{
*this = Length(value, Fixed);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-02-14 02:17:08 UTC (rev 107654)
@@ -4757,7 +4757,7 @@
}
} else if (contentLogicalHeight() > boundedMultiply(pageLogicalHeight, desiredColumnCount)) {
// Now that we know the intrinsic height of the columns, we have to rebalance them.
- columnHeight = max<LayoutUnit>(colInfo->minimumColumnHeight(), ceilf(contentLogicalHeight().toFloat() / desiredColumnCount));
+ columnHeight = max<LayoutUnit>(colInfo->minimumColumnHeight(), (contentLogicalHeight() / desiredColumnCount).ceil());
}
if (columnHeight && columnHeight != pageLogicalHeight) {
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp (107653 => 107654)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp 2012-02-14 02:10:17 UTC (rev 107653)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp 2012-02-14 02:17:08 UTC (rev 107654)
@@ -1977,9 +1977,9 @@
// https://bugs.webkit.org/show_bug.cgi?id=46418
RenderStyle* styleToUse = style();
if (hasOverrideHeight() && parent()->isFlexibleBoxIncludingDeprecated())
- h = Length((overrideHeight() - borderAndPaddingLogicalHeight()).toFloat(), Fixed);
+ h = Length((overrideHeight() - borderAndPaddingLogicalHeight()), Fixed);
else if (treatAsReplaced)
- h = Length(computeReplacedLogicalHeight().toFloat(), Fixed);
+ h = Length(computeReplacedLogicalHeight(), Fixed);
else {
h = styleToUse->logicalHeight();
checkMinMaxHeight = true;
@@ -2243,7 +2243,7 @@
cb = cb->containingBlock();
}
}
- return computeContentBoxLogicalHeight(logicalHeight.calcValue(availableHeight.toFloat()));
+ return computeContentBoxLogicalHeight(logicalHeight.calcValue(availableHeight));
}
default:
return intrinsicLogicalHeight();
@@ -2431,7 +2431,7 @@
}
}
}
- logicalLeft.setValue(Fixed, staticPosition.toFloat());
+ logicalLeft.setValue(Fixed, staticPosition);
} else {
RenderBox* enclosingBox = child->parent()->enclosingBox();
LayoutUnit staticPosition = child->layer()->staticInlinePosition() + containerLogicalWidth + containerBlock->borderLogicalLeft();
@@ -2456,7 +2456,7 @@
if (curr == containerBlock)
break;
}
- logicalRight.setValue(Fixed, staticPosition.toFloat());
+ logicalRight.setValue(Fixed, staticPosition);
}
}
@@ -2583,7 +2583,7 @@
}
if (stretchesToMinIntrinsicLogicalWidth() && logicalWidth() < minPreferredLogicalWidth() - bordersPlusPadding) {
- computePositionedLogicalWidthUsing(Length((minPreferredLogicalWidth() - bordersPlusPadding).toFloat(), Fixed), containerBlock, containerDirection,
+ computePositionedLogicalWidthUsing(Length((minPreferredLogicalWidth() - bordersPlusPadding), Fixed), containerBlock, containerDirection,
containerLogicalWidth, bordersPlusPadding,
logicalLeftLength, logicalRightLength, marginLogicalLeft, marginLogicalRight,
logicalWidthResult, marginLogicalLeftAlias, marginLogicalRightAlias, logicalLeftResult);
@@ -2806,7 +2806,7 @@
if (curr->isBox() && !curr->isTableRow())
staticLogicalTop += toRenderBox(curr)->logicalTop();
}
- logicalTop.setValue(Fixed, staticLogicalTop.toFloat());
+ logicalTop.setValue(Fixed, staticLogicalTop);
}
void RenderBox::computePositionedLogicalHeight()
@@ -2970,7 +2970,7 @@
// Height is never unsolved for tables.
if (isTable()) {
- logicalHeightLength.setValue(Fixed, contentLogicalHeight.toFloat());
+ logicalHeightLength.setValue(Fixed, contentLogicalHeight);
logicalHeightIsAuto = false;
}
@@ -3481,7 +3481,7 @@
LayoutSize difference = cmp - point;
- float dist = difference.width().toFloat() * difference.width().toFloat() + difference.height().toFloat() * difference.height().toFloat();
+ float dist = difference.width() * difference.width() + difference.height() * difference.height();
if (dist < minDist) {
closestRenderer = renderer;
minDist = dist;
