| Index: Source/core/paint/ObjectPainter.cpp
|
| diff --git a/Source/core/paint/ObjectPainter.cpp b/Source/core/paint/ObjectPainter.cpp
|
| index 2d43a1d15aa113439344e85312e0f0589606f9b2..eb540a2ec0b27c1363eb7193bd307ef4a62adbbf 100644
|
| --- a/Source/core/paint/ObjectPainter.cpp
|
| +++ b/Source/core/paint/ObjectPainter.cpp
|
| @@ -32,16 +32,16 @@ void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const ComputedSty
|
| paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), style.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor));
|
| }
|
|
|
| -void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& objectBounds, const LayoutRect& visualOverflowBounds)
|
| +void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& objectBounds, const LayoutRect& visualOverflowBounds, const LayoutPoint& paintOffset)
|
| {
|
| const ComputedStyle& styleToUse = m_layoutObject.styleRef();
|
| if (!styleToUse.hasOutline())
|
| return;
|
|
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutObject, paintInfo.phase))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutObject, paintInfo.phase, paintOffset))
|
| return;
|
|
|
| - LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutObject, paintInfo.phase, visualOverflowBounds);
|
| + LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutObject, paintInfo.phase, visualOverflowBounds, paintOffset);
|
|
|
| if (styleToUse.outlineStyleIsAuto()) {
|
| if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutObject)) {
|
| @@ -84,10 +84,10 @@ void ObjectPainter::addPDFURLRectIfNeeded(const PaintInfo& paintInfo, const Layo
|
| if (rect.isEmpty())
|
| return;
|
|
|
| - if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutObject, DisplayItem::PrintedContentPDFURLRect))
|
| + if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutObject, DisplayItem::PrintedContentPDFURLRect, paintOffset))
|
| return;
|
|
|
| - LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutObject, DisplayItem::PrintedContentPDFURLRect, rect);
|
| + LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutObject, DisplayItem::PrintedContentPDFURLRect, rect, paintOffset);
|
| if (url.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(url, m_layoutObject.document().baseURL())) {
|
| String fragmentName = url.fragmentIdentifier();
|
| if (m_layoutObject.document().findAnchor(fragmentName))
|
|
|