Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp (109799 => 109800)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-05 21:59:10 UTC (rev 109799)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2012-03-05 21:59:29 UTC (rev 109800)
@@ -1109,8 +1109,8 @@
LineInfo& lineInfo() { return m_lineInfo; }
const LineInfo& lineInfo() const { return m_lineInfo; }
- int endLineLogicalTop() const { return m_endLineLogicalTop; }
- void setEndLineLogicalTop(int logicalTop) { m_endLineLogicalTop = logicalTop; }
+ LayoutUnit endLineLogicalTop() const { return m_endLineLogicalTop; }
+ void setEndLineLogicalTop(LayoutUnit logicalTop) { m_endLineLogicalTop = logicalTop; }
RootInlineBox* endLine() const { return m_endLine; }
void setEndLine(RootInlineBox* line) { m_endLine = line; }
@@ -1129,7 +1129,7 @@
RootInlineBox* m_endLine;
LineInfo m_lineInfo;
unsigned m_floatIndex;
- int m_endLineLogicalTop;
+ LayoutUnit m_endLineLogicalTop;
bool m_endLineMatched;
bool m_checkForFloatsFromLastLine;
@@ -1517,7 +1517,7 @@
// Expand the last line to accommodate Ruby and emphasis marks.
int lastLineAnnotationsAdjustment = 0;
if (lastRootBox()) {
- LayoutUnit lowestAllowedPosition = max<LayoutUnit>(lastRootBox()->lineBottom(), logicalHeight() + paddingAfter());
+ LayoutUnit lowestAllowedPosition = max(lastRootBox()->lineBottom(), logicalHeight() + paddingAfter());
if (!style()->isFlippedLinesWritingMode())
lastLineAnnotationsAdjustment = lastRootBox()->computeUnderAnnotationAdjustment(lowestAllowedPosition);
else
@@ -1752,13 +1752,13 @@
return true;
// See if any floats end in the range along which we want to shift the lines vertically.
- LayoutUnit logicalTop = min<LayoutUnit>(logicalHeight(), layoutState.endLineLogicalTop());
+ LayoutUnit logicalTop = min(logicalHeight(), layoutState.endLineLogicalTop());
RootInlineBox* lastLine = layoutState.endLine();
while (RootInlineBox* nextLine = lastLine->nextRootBox())
lastLine = nextLine;
- LayoutUnit logicalBottom = lastLine->lineBottomWithLeading() + lineDelta.abs();
+ LayoutUnit logicalBottom = lastLine->lineBottomWithLeading() + abs(lineDelta);
const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
FloatingObjectSetIterator end = floatingObjectSet.end();
@@ -2691,7 +2691,7 @@
DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1));
const Font& firstLineFont = firstLineStyle()->font();
LayoutUnit firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, firstLineStyle()));
- LayoutUnit ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : LayoutUnit(font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style())));
+ LayoutUnit ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : static_cast<LayoutUnit>(font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style())));
// For LTR text truncation, we want to get the right edge of our padding box, and then we want to see
// if the right edge of a line box exceeds that. For RTL, we use the left edge of the padding box and
