| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index bfa7f42e6a2a5ffe0ea14251f9479f406bfa083c..9336cc6fbeec17527009af76124585cd949234e9 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -4410,7 +4410,7 @@ LayoutRect RenderBlock::localCaretRect(InlineBox* inlineBox, int caretOffset, La
|
| return caretRect;
|
| }
|
|
|
| -void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
|
| +void RenderBlock::addFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const
|
| {
|
| // For blocks inside inlines, we go ahead and include margins so that we run right up to the
|
| // inline boxes above and below us (thus getting merged with them to form a single irregular
|
| @@ -4426,9 +4426,9 @@ void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& a
|
| LayoutUnit bottomMargin = nextInlineHasLineBox ? collapsedMarginAfter() : LayoutUnit();
|
| LayoutRect rect(additionalOffset.x(), additionalOffset.y() - topMargin, width(), height() + topMargin + bottomMargin);
|
| if (!rect.isEmpty())
|
| - rects.append(pixelSnappedIntRect(rect));
|
| + rects.append(rect);
|
| } else if (width() && height()) {
|
| - rects.append(pixelSnappedIntRect(additionalOffset, size()));
|
| + rects.append(LayoutRect(additionalOffset, size()));
|
| }
|
|
|
| if (!hasOverflowClip() && !hasControlClip()) {
|
| @@ -4437,14 +4437,14 @@ void RenderBlock::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& a
|
| LayoutUnit bottom = std::min<LayoutUnit>(curr->lineBottom(), curr->top() + curr->height());
|
| LayoutRect rect(additionalOffset.x() + curr->x(), additionalOffset.y() + top, curr->width(), bottom - top);
|
| if (!rect.isEmpty())
|
| - rects.append(pixelSnappedIntRect(rect));
|
| + rects.append(rect);
|
| }
|
|
|
| addChildFocusRingRects(rects, additionalOffset, paintContainer);
|
| }
|
|
|
| if (inlineElementContinuation())
|
| - inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + inlineElementContinuation()->containingBlock()->location() - location()), paintContainer);
|
| + inlineElementContinuation()->addFocusRingRects(rects, additionalOffset + (inlineElementContinuation()->containingBlock()->location() - location()), paintContainer);
|
| }
|
|
|
| void RenderBlock::computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const
|
|
|