Index: third_party/WebKit/Source/core/paint/FieldsetPainter.cpp |
diff --git a/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp b/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp |
index b5916031833aaf5106f20ddac2965722c466fed4..fdd71297704cedddaafadace5d8f6f359aef9ffe 100644 |
--- a/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/FieldsetPainter.cpp |
@@ -24,7 +24,7 @@ void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c |
if (!legend) |
return BoxPainter(m_layoutFieldset).paintBoxDecorationBackground(paintInfo, paintOffset); |
- if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutFieldset, paintInfo.phase, paintOffset)) |
+ if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutFieldset, paintInfo.phase, paintOffset)) |
return; |
// FIXME: We need to work with "rl" and "bt" block flow directions. In those |
@@ -40,7 +40,7 @@ void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c |
paintRect.setX(paintRect.x() + xOff); |
} |
- LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutFieldset, paintInfo.phase, paintRect, paintOffset); |
+ LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutFieldset, paintInfo.phase, paintRect, paintOffset); |
BoxDecorationData boxDecorationData(m_layoutFieldset); |
if (boxDecorationData.bleedAvoidance == BackgroundBleedNone) |
@@ -52,8 +52,8 @@ void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c |
return; |
// Create a clipping region around the legend and paint the border as normal |
- GraphicsContext* graphicsContext = paintInfo.context; |
- GraphicsContextStateSaver stateSaver(*graphicsContext); |
+ GraphicsContext& graphicsContext = paintInfo.context; |
+ GraphicsContextStateSaver stateSaver(graphicsContext); |
// FIXME: We need to work with "rl" and "bt" block flow directions. In those |
// cases the legend is embedded in the right and bottom borders respectively. |
@@ -61,11 +61,11 @@ void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c |
if (m_layoutFieldset.style()->isHorizontalWritingMode()) { |
LayoutUnit clipTop = paintRect.y(); |
LayoutUnit clipHeight = max(static_cast<LayoutUnit>(m_layoutFieldset.style()->borderTopWidth()), legend->size().height() - ((legend->size().height() - m_layoutFieldset.borderTop()) / 2)); |
- graphicsContext->clipOut(pixelSnappedIntRect(paintRect.x() + legend->location().x(), clipTop, legend->size().width(), clipHeight)); |
+ graphicsContext.clipOut(pixelSnappedIntRect(paintRect.x() + legend->location().x(), clipTop, legend->size().width(), clipHeight)); |
} else { |
LayoutUnit clipLeft = paintRect.x(); |
LayoutUnit clipWidth = max(static_cast<LayoutUnit>(m_layoutFieldset.style()->borderLeftWidth()), legend->size().width()); |
- graphicsContext->clipOut(pixelSnappedIntRect(clipLeft, paintRect.y() + legend->location().y(), clipWidth, legend->size().height())); |
+ graphicsContext.clipOut(pixelSnappedIntRect(clipLeft, paintRect.y() + legend->location().y(), clipWidth, legend->size().height())); |
} |
BoxPainter::paintBorder(m_layoutFieldset, paintInfo, paintRect, m_layoutFieldset.styleRef()); |
@@ -81,7 +81,7 @@ void FieldsetPainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& p |
if (!legend) |
return BoxPainter(m_layoutFieldset).paintMask(paintInfo, paintOffset); |
- if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutFieldset, paintInfo.phase, paintOffset)) |
+ if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutFieldset, paintInfo.phase, paintOffset)) |
return; |
// FIXME: We need to work with "rl" and "bt" block flow directions. In those |
@@ -97,7 +97,7 @@ void FieldsetPainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& p |
paintRect.move(xOff, 0); |
} |
- LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutFieldset, paintInfo.phase, paintRect, paintOffset); |
+ LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutFieldset, paintInfo.phase, paintRect, paintOffset); |
BoxPainter(m_layoutFieldset).paintMaskImages(paintInfo, paintRect); |
} |