| Index: Source/core/rendering/RootInlineBox.cpp
|
| diff --git a/Source/core/rendering/RootInlineBox.cpp b/Source/core/rendering/RootInlineBox.cpp
|
| index fa1def21b84edbcd6d078e6d600c526788eb4073..8ed908fcb9258ea72029b0b2389771467f4225a4 100644
|
| --- a/Source/core/rendering/RootInlineBox.cpp
|
| +++ b/Source/core/rendering/RootInlineBox.cpp
|
| @@ -170,7 +170,7 @@ float RootInlineBox::placeEllipsisBox(bool ltr, float blockLeftEdge, float block
|
| void RootInlineBox::paintEllipsisBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) const
|
| {
|
| if (hasEllipsisBox() && paintInfo.shouldPaintWithinRoot(renderer()) && renderer()->style()->visibility() == VISIBLE
|
| - && paintInfo.phase == PaintPhaseForeground)
|
| + && paintInfo.getPhase() == PaintPhaseForeground)
|
| ellipsisBox()->paint(paintInfo, paintOffset, lineTop, lineBottom);
|
| }
|
|
|
| @@ -428,7 +428,7 @@ LayoutUnit RootInlineBox::lineSnapAdjustment(LayoutUnit delta) const
|
| }
|
|
|
| GapRects RootInlineBox::lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
|
| - LayoutUnit selTop, LayoutUnit selHeight, const PaintInfo* paintInfo)
|
| + LayoutUnit selTop, LayoutUnit selHeight, PaintInfo* paintInfo)
|
| {
|
| RenderObject::SelectionState lineState = selectionState();
|
|
|
| @@ -464,7 +464,7 @@ GapRects RootInlineBox::lineSelectionGap(RenderBlock* rootBlock, const LayoutPoi
|
| LayoutRect gapRect = rootBlock->logicalRectToPhysicalRect(rootBlockPhysicalPosition, logicalRect);
|
| if (isPreviousBoxSelected && gapRect.width() > 0 && gapRect.height() > 0) {
|
| if (paintInfo && box->parent()->renderer()->style()->visibility() == VISIBLE)
|
| - paintInfo->context->fillRect(gapRect, box->parent()->renderer()->selectionBackgroundColor());
|
| + paintInfo->getContext()->fillRect(gapRect, box->parent()->renderer()->selectionBackgroundColor());
|
| // VisibleSelection may be non-contiguous, see comment above.
|
| result.uniteCenter(gapRect);
|
| }
|
|
|