Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp (109946 => 109947)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-03-06 20:13:37 UTC (rev 109946)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-03-06 20:14:12 UTC (rev 109947)
@@ -1584,8 +1584,8 @@
// If we have clipped overflow, we should use layout overflow as well, since visual overflow from lines didn't propagate to our block's overflow.
// Note the old code did this as well but even for overflow:visible. The addition of hasOverflowClip() at least tightens up the hack a bit.
// layoutInlineChildren should be patched to compute the entire repaint rect.
- repaintLogicalLeft = min<LayoutUnit>(repaintLogicalLeft, logicalLeftLayoutOverflow());
- repaintLogicalRight = max<LayoutUnit>(repaintLogicalRight, logicalRightLayoutOverflow());
+ repaintLogicalLeft = min(repaintLogicalLeft, logicalLeftLayoutOverflow());
+ repaintLogicalRight = max(repaintLogicalRight, logicalRightLayoutOverflow());
}
LayoutRect repaintRect;
@@ -2439,7 +2439,7 @@
if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normalChildNeedsLayout() || selfNeedsLayout())
return false;
- LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasColumns() || hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasColumns() || hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
return false;
@@ -4462,7 +4462,7 @@
if (!scrollsOverflow())
return false;
- return layer()->hitTestOverflowControls(result, toPoint(roundedIntSize(pointInContainer - accumulatedOffset)));
+ return layer()->hitTestOverflowControls(result, roundedIntPoint(pointInContainer - toLayoutSize(accumulatedOffset)));
}
bool RenderBlock::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
@@ -5004,7 +5004,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() / desiredColumnCount));
+ columnHeight = max<LayoutUnit>(colInfo->minimumColumnHeight(), ceilf((float)contentLogicalHeight() / desiredColumnCount));
}
if (columnHeight && columnHeight != pageLogicalHeight) {
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp (109946 => 109947)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-06 20:13:37 UTC (rev 109946)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-06 20:14:12 UTC (rev 109947)
@@ -98,7 +98,7 @@
private:
void computeAvailableWidthFromLeftAndRight()
{
- m_availableWidth = max<LayoutUnit>(0, m_right - m_left) + m_overhangWidth;
+ m_availableWidth = max(zeroLayoutUnit, m_right - m_left) + m_overhangWidth;
}
private:
@@ -1096,8 +1096,8 @@
void updateRepaintRangeFromBox(RootInlineBox* box, LayoutUnit paginationDelta = 0)
{
m_usesRepaintBounds = true;
- m_repaintLogicalTop = min<LayoutUnit>(m_repaintLogicalTop, box->logicalTopVisualOverflow() + min(paginationDelta, zeroLayoutUnit));
- m_repaintLogicalBottom = max<LayoutUnit>(m_repaintLogicalBottom, box->logicalBottomVisualOverflow() + max(paginationDelta, zeroLayoutUnit));
+ m_repaintLogicalTop = min(m_repaintLogicalTop, box->logicalTopVisualOverflow() + min(paginationDelta, zeroLayoutUnit));
+ m_repaintLogicalBottom = max(m_repaintLogicalBottom, box->logicalBottomVisualOverflow() + max(paginationDelta, zeroLayoutUnit));
}
bool endLineMatched() const { return m_endLineMatched; }
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp (109946 => 109947)
--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-03-06 20:13:37 UTC (rev 109946)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-03-06 20:14:12 UTC (rev 109947)
@@ -1833,7 +1833,7 @@
return page && page->focusController()->isActive();
}
-static LayoutUnit cornerStart(const RenderLayer* layer, int minX, int maxX, int thickness)
+static int cornerStart(const RenderLayer* layer, int minX, int maxX, int thickness)
{
if (layer->renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
return minX + layer->renderer()->style()->borderLeftWidth();
