Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index df369d8353aa72952fa9619b38ce238f85e55ba2..86d021ee36451fd93f64618fb4157d570ef97cc5 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -2907,7 +2907,7 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) |
flipForWritingMode(overflowBox); |
overflowBox.inflate(maximalOutlineSize(paintInfo.phase)); |
overflowBox.moveBy(adjustedPaintOffset); |
- if (!overflowBox.intersects(paintInfo.rect)) |
+ if (!overflowBox.intersects(paintInfo.rect())) |
return; |
} |
@@ -2926,7 +2926,7 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) |
// z-index. We paint after we painted the background/border, so that the scrollbars will |
// sit above the background/border. |
if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == PaintPhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.shouldPaintWithinRoot(this) && !paintInfo.paintRootBackgroundOnly()) |
- layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect); |
+ layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect()); |
} |
void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const LayoutPoint& paintOffset) |
@@ -3041,9 +3041,9 @@ void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const LayoutPoint& p |
} |
colRect.moveBy(paintOffset); |
PaintInfo info(paintInfo); |
- info.rect.intersect(pixelSnappedIntRect(colRect)); |
+ info.rect().intersect(pixelSnappedIntRect(colRect)); |
- if (!info.rect.isEmpty()) { |
+ if (!info.rect().isEmpty()) { |
GraphicsContextStateSaver stateSaver(*context); |
LayoutRect clipRect(colRect); |
@@ -3132,9 +3132,9 @@ void RenderBlock::paintCaret(PaintInfo& paintInfo, const LayoutPoint& paintOffse |
return; |
if (type == CursorCaret) |
- frame()->selection()->paintCaret(paintInfo.context, paintOffset, paintInfo.rect); |
+ frame()->selection()->paintCaret(paintInfo.context, paintOffset, paintInfo.rect()); |
else |
- frame()->page()->dragCaretController().paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect); |
+ frame()->page()->dragCaretController().paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect()); |
} |
void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset) |
@@ -3544,8 +3544,8 @@ GapRects RenderBlock::inlineSelectionGaps(RenderBlock* rootBlock, const LayoutPo |
LayoutRect logicalRect(curr->logicalLeft(), selTop, curr->logicalWidth(), selTop + selHeight); |
logicalRect.move(isHorizontalWritingMode() ? offsetFromRootBlock : offsetFromRootBlock.transposedSize()); |
LayoutRect physicalRect = rootBlock->logicalRectToPhysicalRect(rootBlockPhysicalPosition, logicalRect); |
- if (!paintInfo || (isHorizontalWritingMode() && physicalRect.y() < paintInfo->rect.maxY() && physicalRect.maxY() > paintInfo->rect.y()) |
- || (!isHorizontalWritingMode() && physicalRect.x() < paintInfo->rect.maxX() && physicalRect.maxX() > paintInfo->rect.x())) |
+ if (!paintInfo || (isHorizontalWritingMode() && physicalRect.y() < paintInfo->rect().maxY() && physicalRect.maxY() > paintInfo->rect().y()) |
+ || (!isHorizontalWritingMode() && physicalRect.x() < paintInfo->rect().maxX() && physicalRect.maxX() > paintInfo->rect().x())) |
result.unite(curr->lineSelectionGap(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, selTop, selHeight, paintInfo)); |
lastSelectedLine = curr; |