Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.cpp 2012-03-08 01:47:36 UTC (rev 110125)
@@ -5823,9 +5823,9 @@
bool ignoreBaseline = (layer() && (layer()->marquee() || (direction == HorizontalLine ? (layer()->verticalScrollbar() || layer()->scrollYOffset() != 0)
: (layer()->horizontalScrollbar() || layer()->scrollXOffset() != 0)))) || (isWritingModeRoot() && !isRubyRun());
- int baselinePos = ignoreBaseline ? -1 : lastLineBoxBaseline();
+ LayoutUnit baselinePos = ignoreBaseline ? static_cast<LayoutUnit>(-1) : lastLineBoxBaseline();
- int bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
+ LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
if (baselinePos != -1 && baselinePos <= bottomOfContent)
return direction == HorizontalLine ? marginTop() + baselinePos : marginRight() + baselinePos;
@@ -5836,7 +5836,7 @@
return fontMetrics.ascent(baselineType) + (lineHeight(firstLine, direction, linePositionMode) - fontMetrics.height()) / 2;
}
-int RenderBlock::firstLineBoxBaseline() const
+LayoutUnit RenderBlock::firstLineBoxBaseline() const
{
if (!isBlockFlow() || (isWritingModeRoot() && !isRubyRun()))
return -1;
@@ -5860,7 +5860,7 @@
return -1;
}
-int RenderBlock::lastLineBoxBaseline() const
+LayoutUnit RenderBlock::lastLineBoxBaseline() const
{
if (!isBlockFlow() || (isWritingModeRoot() && !isRubyRun()))
return -1;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBlock.h (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBlock.h 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBlock.h 2012-03-08 01:47:36 UTC (rev 110125)
@@ -439,8 +439,8 @@
virtual void computePreferredLogicalWidths();
- virtual int firstLineBoxBaseline() const;
- virtual int lastLineBoxBaseline() const;
+ virtual LayoutUnit firstLineBoxBaseline() const;
+ virtual LayoutUnit lastLineBoxBaseline() const;
virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBox.h (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-03-08 01:47:36 UTC (rev 110125)
@@ -407,8 +407,8 @@
RenderLayer* enclosingFloatPaintingLayer() const;
- virtual int firstLineBoxBaseline() const { return -1; }
- virtual int lastLineBoxBaseline() const { return -1; }
+ virtual LayoutUnit firstLineBoxBaseline() const { return -1; }
+ virtual LayoutUnit lastLineBoxBaseline() const { return -1; }
bool shrinkToAvoidFloats() const;
virtual bool avoidsFloats() const;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-03-08 01:47:36 UTC (rev 110125)
@@ -1207,7 +1207,7 @@
{
}
-int RenderTable::firstLineBoxBaseline() const
+LayoutUnit RenderTable::firstLineBoxBaseline() const
{
if (isWritingModeRoot())
return -1;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTable.h (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTable.h 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTable.h 2012-03-08 01:47:36 UTC (rev 110125)
@@ -231,7 +231,7 @@
virtual void computePreferredLogicalWidths();
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
- virtual int firstLineBoxBaseline() const;
+ virtual LayoutUnit firstLineBoxBaseline() const;
virtual RenderBlock* firstLineBlock() const;
virtual void updateFirstLetter();
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.cpp (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.cpp 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.cpp 2012-03-08 01:47:36 UTC (rev 110125)
@@ -898,12 +898,12 @@
m_outerBorderEnd = calcOuterBorderEnd();
}
-int RenderTableSection::firstLineBoxBaseline() const
+LayoutUnit RenderTableSection::firstLineBoxBaseline() const
{
if (!m_grid.size())
return -1;
- int firstLineBaseline = m_grid[0].baseline;
+ LayoutUnit firstLineBaseline = m_grid[0].baseline;
if (firstLineBaseline)
return firstLineBaseline + m_rowPos[0];
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.h (110124 => 110125)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.h 2012-03-08 01:45:45 UTC (rev 110124)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTableSection.h 2012-03-08 01:47:36 UTC (rev 110125)
@@ -67,7 +67,7 @@
virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
- virtual int firstLineBoxBaseline() const;
+ virtual LayoutUnit firstLineBoxBaseline() const;
void addCell(RenderTableCell*, RenderTableRow* row);
