Diff
Modified: branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-02-07 21:06:31 UTC (rev 106979)
@@ -1513,7 +1513,7 @@
VisiblePositionRange range = VisiblePositionRange(visSelection.visibleStart(), visSelection.visibleEnd());
IntRect bounds = boundsForVisiblePositionRange(range);
#if PLATFORM(MAC)
- bounds.setLocation(m_renderer->document()->view()->screenToContents(roundedIntPoint(bounds.location())));
+ bounds.setLocation(m_renderer->document()->view()->screenToContents(bounds.location()));
#endif
return IntPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
}
@@ -2818,7 +2818,7 @@
return IntRect();
}
-AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTMLAreaElement* area, const LayoutPoint& point) const
+AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTMLAreaElement* area, const IntPoint& point) const
{
if (!area)
return 0;
Modified: branches/subpixellayout/Source/WebCore/page/Page.cpp (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/page/Page.cpp 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/page/Page.cpp 2012-02-07 21:06:31 UTC (rev 106979)
@@ -1103,7 +1103,7 @@
// The objects are only relevant if they are being painted within the viewRect().
if (RenderView* view = object->view()) {
- if (!objectPaintRect.intersects(view->viewRect()))
+ if (!objectPaintRect.intersects(pixelSnappedIntRect(view->viewRect())))
return;
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-02-07 21:06:31 UTC (rev 106979)
@@ -1742,7 +1742,7 @@
}
LayoutUnit baseWidth = renderer->width() - (isBoxSizingBorder ? LayoutUnit(0) : renderer->borderAndPaddingWidth());
baseWidth = baseWidth / zoomFactor;
- styleDeclaration->setProperty(CSSPropertyWidth, String::number((baseWidth + difference.width().toFloat()) + "px", false);
+ styleDeclaration->setProperty(CSSPropertyWidth, String::number((baseWidth + difference.width()).toFloat()) + "px", false);
}
if (resize != RESIZE_HORIZONTAL && difference.height()) {
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-02-07 21:06:31 UTC (rev 106979)
@@ -272,7 +272,7 @@
bool isCSSTable = !node() || !node()->hasTagName(tableTag);
if (isCSSTable && styleLogicalWidth.isFixed() && styleLogicalWidth.isPositive()) {
recalcBordersInRowDirection();
- borders = borderStart() + borderEnd() + (collapseBorders() ? 0 : paddingStart() + paddingEnd());
+ borders = borderStart() + borderEnd() + (collapseBorders() ? LayoutUnit(0) : paddingStart() + paddingEnd());
}
return styleLogicalWidth.calcMinValue(availableWidth) + borders;
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm 2012-02-07 21:06:31 UTC (rev 106979)
@@ -825,8 +825,8 @@
NSLevelIndicatorCell* cell = levelIndicatorFor(renderMeter);
// Makes enough room for cell's intrinsic size.
NSSize cellSize = [cell cellSizeForBounds:LayoutRect(LayoutPoint(), bounds.size())];
- return LayoutSize(bounds.width() < cellSize.width ? cellSize.width : bounds.width(),
- bounds.height() < cellSize.height ? cellSize.height : bounds.height());
+ return LayoutSize(bounds.width().toInt() < cellSize.width ? cellSize.width : bounds.width().toInt(),
+ bounds.height().toInt() < cellSize.height ? cellSize.height : bounds.height().toInt());
}
bool RenderThemeMac::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
Modified: branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGShape.cpp (106978 => 106979)
--- branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2012-02-07 20:48:30 UTC (rev 106978)
+++ branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2012-02-07 21:06:31 UTC (rev 106979)
@@ -325,7 +325,7 @@
}
-void RenderSVGShape::paint(PaintInfo& paintInfo, const IntPoint&)
+void RenderSVGShape::paint(PaintInfo& paintInfo, const LayoutPoint&)
{
if (paintInfo.context->paintingDisabled() || style()->visibility() == HIDDEN || isEmpty())
return;
