diff options
Diffstat (limited to 'WebCore/rendering/RootInlineBox.h')
| -rw-r--r-- | WebCore/rendering/RootInlineBox.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebCore/rendering/RootInlineBox.h b/WebCore/rendering/RootInlineBox.h index 4a0b485..f13d00f 100644 --- a/WebCore/rendering/RootInlineBox.h +++ b/WebCore/rendering/RootInlineBox.h @@ -54,7 +54,7 @@ public: void setPaginationStrut(int s) { m_paginationStrut = s; } int selectionTop() const; - int selectionBottom() const { return lineBottom(); } + int selectionBottom() const; int selectionHeight() const { return max(0, selectionBottom() - selectionTop()); } int alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAndFallbackFontsMap&); @@ -88,8 +88,8 @@ public: virtual void clearTruncation(); - virtual int baselinePosition() const { return boxModelObject()->baselinePosition(m_firstLine, m_isVertical ? VerticalLine : HorizontalLine, PositionOfInteriorLineBoxes); } - virtual int lineHeight() const { return boxModelObject()->lineHeight(m_firstLine, m_isVertical ? VerticalLine : HorizontalLine, PositionOfInteriorLineBoxes); } + virtual int baselinePosition() const { return boxModelObject()->baselinePosition(m_firstLine, isHorizontal() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes); } + virtual int lineHeight() const { return boxModelObject()->lineHeight(m_firstLine, isHorizontal() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes); } #if PLATFORM(MAC) void addHighlightOverflow(); @@ -106,8 +106,7 @@ public: InlineBox* firstSelectedBox(); InlineBox* lastSelectedBox(); - GapRects fillLineSelectionGap(int selTop, int selHeight, RenderBlock* rootBlock, int blockX, int blockY, - int tx, int ty, const PaintInfo*); + GapRects lineSelectionGap(RenderBlock* rootBlock, const IntPoint& rootBlockPhysicalPosition, const IntSize& offsetFromRootBlock, int selTop, int selHeight, const PaintInfo*); RenderBlock* block() const; |