Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp |
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp |
index 67d07a21e0bbbd30feac4b191b26766e73b1080b..2060de966e14881ac0c8de83b875f9a65a7f7c43 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp |
@@ -49,7 +49,7 @@ static inline bool shouldSuppressPaintingLayer(PaintLayer* layer) |
return false; |
} |
-void PaintLayerPainter::paint(GraphicsContext* context, const LayoutRect& damageRect, const GlobalPaintFlags globalPaintFlags, LayoutObject* paintingRoot, PaintLayerFlags paintFlags) |
+void PaintLayerPainter::paint(GraphicsContext& context, const LayoutRect& damageRect, const GlobalPaintFlags globalPaintFlags, LayoutObject* paintingRoot, PaintLayerFlags paintFlags) |
{ |
PaintLayerPaintingInfo paintingInfo(&m_paintLayer, LayoutRect(enclosingIntRect(damageRect)), globalPaintFlags, LayoutSize(), paintingRoot); |
if (shouldPaintLayerInSoftwareMode(globalPaintFlags, paintFlags)) |
@@ -61,7 +61,7 @@ static ShouldRespectOverflowClip shouldRespectOverflowClip(PaintLayerFlags paint |
return (paintFlags & PaintLayerPaintingOverflowContents || (paintFlags & PaintLayerPaintingChildClippingMaskPhase && layoutObject->hasClipPath())) ? IgnoreOverflowClip : RespectOverflowClip; |
} |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintLayer(GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintLayer(GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
{ |
// https://code.google.com/p/chromium/issues/detail?id=343772 |
DisableCompositingQueryAsserts disabler; |
@@ -93,7 +93,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayer(GraphicsContext* co |
if (m_paintLayer.paintsWithTransparency(paintingInfo.globalPaintFlags())) |
paintFlags |= PaintLayerHaveTransparency; |
- LayerFixedPositionRecorder fixedPositionRecorder(*context, *m_paintLayer.layoutObject()); |
+ LayerFixedPositionRecorder fixedPositionRecorder(context, *m_paintLayer.layoutObject()); |
// PaintLayerAppliedTransform is used in LayoutReplica, to avoid applying the transform twice. |
if (m_paintLayer.paintsWithTransform(paintingInfo.globalPaintFlags()) && !(paintFlags & PaintLayerAppliedTransform)) |
@@ -102,7 +102,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayer(GraphicsContext* co |
return paintLayerContentsAndReflection(context, paintingInfo, paintFlags); |
} |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContentsAndReflection(GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, FragmentPolicy fragmentPolicy) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContentsAndReflection(GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, FragmentPolicy fragmentPolicy) |
{ |
ASSERT(m_paintLayer.isSelfPaintingLayer() || m_paintLayer.hasSelfPaintingLayerDescendant()); |
@@ -112,7 +112,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContentsAndReflectio |
// Paint the reflection first if we have one. |
if (m_paintLayer.reflectionInfo()) { |
- ScopeRecorder scopeRecorder(*context); |
+ ScopeRecorder scopeRecorder(context); |
m_paintLayer.reflectionInfo()->paint(context, paintingInfo, localPaintFlags); |
result = MaybeNotFullyPainted; |
} |
@@ -126,7 +126,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContentsAndReflectio |
class ClipPathHelper { |
public: |
- ClipPathHelper(GraphicsContext* context, const PaintLayer& paintLayer, PaintLayerPaintingInfo& paintingInfo, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed, |
+ ClipPathHelper(GraphicsContext& context, const PaintLayer& paintLayer, PaintLayerPaintingInfo& paintingInfo, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed, |
const LayoutPoint& offsetFromRoot, PaintLayerFlags paintFlags) |
: m_resourceClipper(0), m_paintLayer(paintLayer), m_context(context) |
{ |
@@ -150,7 +150,7 @@ public: |
rootRelativeBounds = paintLayer.physicalBoundingBoxIncludingReflectionAndStackingChildren(offsetFromRoot); |
rootRelativeBoundsComputed = true; |
} |
- m_clipPathRecorder.emplace(*context, *paintLayer.layoutObject(), clipPath->path(FloatRect(rootRelativeBounds))); |
+ m_clipPathRecorder.emplace(context, *paintLayer.layoutObject(), clipPath->path(FloatRect(rootRelativeBounds))); |
} |
} else if (style.clipPath()->type() == ClipPathOperation::REFERENCE) { |
ReferenceClipPathOperation* referenceClipPathOperation = toReferenceClipPathOperation(style.clipPath()); |
@@ -183,10 +183,10 @@ private: |
Optional<ClipPathRecorder> m_clipPathRecorder; |
SVGClipPainter::ClipperState m_clipperState; |
const PaintLayer& m_paintLayer; |
- GraphicsContext* m_context; |
+ GraphicsContext& m_context; |
}; |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfoArg, PaintLayerFlags paintFlags, FragmentPolicy fragmentPolicy) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfoArg, PaintLayerFlags paintFlags, FragmentPolicy fragmentPolicy) |
{ |
ASSERT(m_paintLayer.isSelfPaintingLayer() || m_paintLayer.hasSelfPaintingLayerDescendant()); |
ASSERT(!(paintFlags & PaintLayerAppliedTransform)); |
@@ -236,7 +236,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon |
} |
Optional<SubsequenceRecorder> subsequenceRecorder; |
- if (!context->printing() |
+ if (!context.printing() |
&& !(paintingInfoArg.globalPaintFlags() & GlobalPaintFlattenCompositingLayers) |
&& !(paintFlags & (PaintLayerPaintingReflection | PaintLayerPaintingRootBackgroundOnly | PaintLayerPaintingOverlayScrollbars | PaintLayerUncachedClipRects)) |
&& m_paintLayer.stackingNode()->isStackingContext() |
@@ -244,9 +244,9 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon |
if (!m_paintLayer.needsRepaint() |
&& !clipRectsChanged |
&& paintingInfoArg.scrollOffsetAccumulation == m_paintLayer.previousScrollOffsetAccumulationForPainting() |
- && SubsequenceRecorder::useCachedSubsequenceIfPossible(*context, m_paintLayer)) |
+ && SubsequenceRecorder::useCachedSubsequenceIfPossible(context, m_paintLayer)) |
return result; |
- subsequenceRecorder.emplace(*context, m_paintLayer); |
+ subsequenceRecorder.emplace(context, m_paintLayer); |
} |
PaintLayerPaintingInfo paintingInfo = paintingInfoArg; |
@@ -276,7 +276,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon |
bool shouldCompositeForBlendMode = (!m_paintLayer.layoutObject()->isDocumentElement() || m_paintLayer.layoutObject()->isSVGRoot()) && m_paintLayer.stackingNode()->isStackingContext() && m_paintLayer.hasNonIsolatedDescendantWithBlendMode(); |
if (shouldCompositeForBlendMode || m_paintLayer.paintsWithTransparency(paintingInfo.globalPaintFlags())) { |
FloatRect compositingBounds = FloatRect(m_paintLayer.paintingExtent(paintingInfo.rootLayer, paintingInfo.subPixelAccumulation, paintingInfo.globalPaintFlags())); |
- compositingRecorder.emplace(*context, *m_paintLayer.layoutObject(), |
+ compositingRecorder.emplace(context, *m_paintLayer.layoutObject(), |
WebCoreCompositeToSkiaComposite(CompositeSourceOver, m_paintLayer.layoutObject()->style()->blendMode()), |
m_paintLayer.layoutObject()->opacity(), &compositingBounds); |
} |
@@ -316,12 +316,12 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon |
Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties; |
if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
if (const auto* objectProperties = m_paintLayer.layoutObject()->objectPaintProperties()) { |
- PaintChunkProperties properties(context->paintController().currentPaintChunkProperties()); |
+ PaintChunkProperties properties(context.paintController().currentPaintChunkProperties()); |
if (TransformPaintPropertyNode* transform = objectProperties->transformForLayerContents()) |
properties.transform = transform; |
if (EffectPaintPropertyNode* effect = objectProperties->effect()) |
properties.effect = effect; |
- scopedPaintChunkProperties.emplace(context->paintController(), properties); |
+ scopedPaintChunkProperties.emplace(context.paintController(), properties); |
} |
} |
@@ -404,7 +404,7 @@ bool PaintLayerPainter::atLeastOneFragmentIntersectsDamageRect(PaintLayerFragmen |
return false; |
} |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerWithTransform(GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerWithTransform(GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
{ |
TransformationMatrix layerTransform = m_paintLayer.renderableTransform(paintingInfo.globalPaintFlags()); |
// If the transform can't be inverted, then don't paint anything. |
@@ -452,7 +452,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerWithTransform(Graphi |
for (const auto& fragment : fragments) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
Optional<LayerClipRecorder> clipRecorder; |
if (parentLayer) { |
ClipRect clipRectForFragment(ancestorBackgroundClipRect); |
@@ -463,7 +463,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerWithTransform(Graphi |
if (needsToClip(paintingInfo, clipRectForFragment)) { |
if (m_paintLayer.layoutObject()->isPositioned() && clipRectForFragment.isClippedByClipCss()) |
UseCounter::count(m_paintLayer.layoutObject()->document(), UseCounter::ClipCssOfPositionedElement); |
- clipRecorder.emplace(*context, *parentLayer->layoutObject(), DisplayItem::ClipLayerParent, clipRectForFragment, &paintingInfo, fragment.paginationOffset, paintFlags); |
+ clipRecorder.emplace(context, *parentLayer->layoutObject(), DisplayItem::ClipLayerParent, clipRectForFragment, &paintingInfo, fragment.paginationOffset, paintFlags); |
} |
} |
if (paintFragmentByApplyingTransform(context, paintingInfo, paintFlags, fragment.paginationOffset) == MaybeNotFullyPainted) |
@@ -472,7 +472,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerWithTransform(Graphi |
return result; |
} |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintFragmentByApplyingTransform(GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& fragmentTranslation) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintFragmentByApplyingTransform(GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& fragmentTranslation) |
{ |
// This involves subtracting out the position of the layer in our current coordinate space, but preserving |
// the accumulated error for sub-pixel layout. |
@@ -487,7 +487,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintFragmentByApplyingTransfo |
// TODO(jbroman): Put the real transform origin here, instead of using a |
// matrix with the origin baked in. |
FloatPoint3D transformOrigin; |
- Transform3DRecorder transform3DRecorder(*context, *m_paintLayer.layoutObject(), DisplayItem::Transform3DElementTransform, transform, transformOrigin); |
+ Transform3DRecorder transform3DRecorder(context, *m_paintLayer.layoutObject(), DisplayItem::Transform3DElementTransform, transform, transformOrigin); |
// Now do a paint with the root layer shifted to be us. |
PaintLayerPaintingInfo transformedPaintingInfo(&m_paintLayer, LayoutRect(enclosingIntRect(transform.inverse().mapRect(paintingInfo.paintDirtyRect))), paintingInfo.globalPaintFlags(), |
@@ -496,7 +496,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintFragmentByApplyingTransfo |
return paintLayerContentsAndReflection(context, transformedPaintingInfo, paintFlags, ForceSingleFragment); |
} |
-PaintLayerPainter::PaintResult PaintLayerPainter::paintChildren(unsigned childrenToVisit, GraphicsContext* context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
+PaintLayerPainter::PaintResult PaintLayerPainter::paintChildren(unsigned childrenToVisit, GraphicsContext& context, const PaintLayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags) |
{ |
PaintResult result = FullyPainted; |
if (!m_paintLayer.hasSelfPaintingLayerDescendant()) |
@@ -553,26 +553,26 @@ bool PaintLayerPainter::shouldPaintLayerInSoftwareMode(const GlobalPaintFlags gl |
|| paintForFixedRootBackground(&m_paintLayer, paintFlags); |
} |
-void PaintLayerPainter::paintOverflowControlsForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, const PaintLayerPaintingInfo& localPaintingInfo, PaintLayerFlags paintFlags) |
+void PaintLayerPainter::paintOverflowControlsForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, const PaintLayerPaintingInfo& localPaintingInfo, PaintLayerFlags paintFlags) |
{ |
bool needsScope = layerFragments.size() > 1; |
for (auto& fragment : layerFragments) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
Optional<LayerClipRecorder> clipRecorder; |
if (needsToClip(localPaintingInfo, fragment.backgroundRect)) |
- clipRecorder.emplace(*context, *m_paintLayer.layoutObject(), DisplayItem::ClipLayerOverflowControls, fragment.backgroundRect, &localPaintingInfo, fragment.paginationOffset, paintFlags); |
+ clipRecorder.emplace(context, *m_paintLayer.layoutObject(), DisplayItem::ClipLayerOverflowControls, fragment.backgroundRect, &localPaintingInfo, fragment.paginationOffset, paintFlags); |
if (PaintLayerScrollableArea* scrollableArea = m_paintLayer.scrollableArea()) { |
CullRect cullRect(pixelSnappedIntRect(fragment.backgroundRect.rect())); |
- ScrollableAreaPainter(*scrollableArea).paintOverflowControls(*context, roundedIntPoint(toPoint(fragment.layerBounds.location() - m_paintLayer.layoutBoxLocation())), cullRect, true); |
+ ScrollableAreaPainter(*scrollableArea).paintOverflowControls(context, roundedIntPoint(toPoint(fragment.layerBounds.location() - m_paintLayer.layoutBoxLocation())), cullRect, true); |
} |
} |
} |
-void PaintLayerPainter::paintFragmentWithPhase(PaintPhase phase, const PaintLayerFragment& fragment, GraphicsContext* context, const ClipRect& clipRect, const PaintLayerPaintingInfo& paintingInfo, LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags, ClipState clipState) |
+void PaintLayerPainter::paintFragmentWithPhase(PaintPhase phase, const PaintLayerFragment& fragment, GraphicsContext& context, const ClipRect& clipRect, const PaintLayerPaintingInfo& paintingInfo, LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags, ClipState clipState) |
{ |
ASSERT(m_paintLayer.isSelfPaintingLayer()); |
@@ -591,7 +591,7 @@ void PaintLayerPainter::paintFragmentWithPhase(PaintPhase phase, const PaintLaye |
break; |
} |
- clipRecorder.emplace(*context, *m_paintLayer.layoutObject(), clipType, clipRect, &paintingInfo, fragment.paginationOffset, paintFlags, clippingRule); |
+ clipRecorder.emplace(context, *m_paintLayer.layoutObject(), clipType, clipRect, &paintingInfo, fragment.paginationOffset, paintFlags, clippingRule); |
} |
LayoutRect newCullRect(clipRect.rect()); |
@@ -605,7 +605,7 @@ void PaintLayerPainter::paintFragmentWithPhase(PaintPhase phase, const PaintLaye |
paintOffset += paintingInfo.scrollOffsetAccumulation; |
newCullRect.move(paintingInfo.scrollOffsetAccumulation); |
- scrollRecorder.emplace(*context, *m_paintLayer.layoutObject(), phase, paintingInfo.scrollOffsetAccumulation); |
+ scrollRecorder.emplace(context, *m_paintLayer.layoutObject(), phase, paintingInfo.scrollOffsetAccumulation); |
} |
PaintInfo paintInfo(context, pixelSnappedIntRect(newCullRect), phase, paintingInfo.globalPaintFlags(), paintFlags, |
paintingRootForLayoutObject, paintingInfo.rootLayer->layoutObject()); |
@@ -613,7 +613,7 @@ void PaintLayerPainter::paintFragmentWithPhase(PaintPhase phase, const PaintLaye |
m_paintLayer.layoutObject()->paint(paintInfo, paintOffset); |
} |
-void PaintLayerPainter::paintBackgroundForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, |
+void PaintLayerPainter::paintBackgroundForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, |
const LayoutRect& transparencyPaintDirtyRect, const PaintLayerPaintingInfo& localPaintingInfo, |
LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags) |
{ |
@@ -621,12 +621,12 @@ void PaintLayerPainter::paintBackgroundForFragments(const PaintLayerFragments& l |
for (auto& fragment : layerFragments) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
paintFragmentWithPhase(PaintPhaseBlockBackground, fragment, context, fragment.backgroundRect, localPaintingInfo, paintingRootForLayoutObject, paintFlags, HasNotClipped); |
} |
} |
-void PaintLayerPainter::paintForegroundForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, |
+void PaintLayerPainter::paintForegroundForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, |
const LayoutRect& transparencyPaintDirtyRect, const PaintLayerPaintingInfo& localPaintingInfo, |
LayoutObject* paintingRootForLayoutObject, bool selectionOnly, PaintLayerFlags paintFlags) |
{ |
@@ -635,7 +635,7 @@ void PaintLayerPainter::paintForegroundForFragments(const PaintLayerFragments& l |
ClipState clipState = HasNotClipped; |
Optional<LayerClipRecorder> clipRecorder; |
if (shouldClip && needsToClip(localPaintingInfo, layerFragments[0].foregroundRect)) { |
- clipRecorder.emplace(*context, *m_paintLayer.layoutObject(), DisplayItem::ClipLayerForeground, layerFragments[0].foregroundRect, &localPaintingInfo, layerFragments[0].paginationOffset, paintFlags); |
+ clipRecorder.emplace(context, *m_paintLayer.layoutObject(), DisplayItem::ClipLayerForeground, layerFragments[0].foregroundRect, &localPaintingInfo, layerFragments[0].paginationOffset, paintFlags); |
clipState = HasClipped; |
} |
@@ -651,7 +651,7 @@ void PaintLayerPainter::paintForegroundForFragments(const PaintLayerFragments& l |
} |
} |
-void PaintLayerPainter::paintForegroundForFragmentsWithPhase(PaintPhase phase, const PaintLayerFragments& layerFragments, GraphicsContext* context, |
+void PaintLayerPainter::paintForegroundForFragmentsWithPhase(PaintPhase phase, const PaintLayerFragments& layerFragments, GraphicsContext& context, |
const PaintLayerPaintingInfo& localPaintingInfo, LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags, ClipState clipState) |
{ |
bool needsScope = layerFragments.size() > 1; |
@@ -659,13 +659,13 @@ void PaintLayerPainter::paintForegroundForFragmentsWithPhase(PaintPhase phase, c |
if (!fragment.foregroundRect.isEmpty()) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
paintFragmentWithPhase(phase, fragment, context, fragment.foregroundRect, localPaintingInfo, paintingRootForLayoutObject, paintFlags, clipState); |
} |
} |
} |
-void PaintLayerPainter::paintOutlineForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, const PaintLayerPaintingInfo& localPaintingInfo, |
+void PaintLayerPainter::paintOutlineForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, const PaintLayerPaintingInfo& localPaintingInfo, |
LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags) |
{ |
bool needsScope = layerFragments.size() > 1; |
@@ -673,37 +673,37 @@ void PaintLayerPainter::paintOutlineForFragments(const PaintLayerFragments& laye |
if (!fragment.backgroundRect.isEmpty()) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
paintFragmentWithPhase(PaintPhaseSelfOutline, fragment, context, fragment.backgroundRect, localPaintingInfo, paintingRootForLayoutObject, paintFlags, HasNotClipped); |
} |
} |
} |
-void PaintLayerPainter::paintMaskForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, const PaintLayerPaintingInfo& localPaintingInfo, |
+void PaintLayerPainter::paintMaskForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, const PaintLayerPaintingInfo& localPaintingInfo, |
LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags) |
{ |
bool needsScope = layerFragments.size() > 1; |
for (auto& fragment : layerFragments) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
paintFragmentWithPhase(PaintPhaseMask, fragment, context, fragment.backgroundRect, localPaintingInfo, paintingRootForLayoutObject, paintFlags, HasNotClipped); |
} |
} |
-void PaintLayerPainter::paintChildClippingMaskForFragments(const PaintLayerFragments& layerFragments, GraphicsContext* context, const PaintLayerPaintingInfo& localPaintingInfo, |
+void PaintLayerPainter::paintChildClippingMaskForFragments(const PaintLayerFragments& layerFragments, GraphicsContext& context, const PaintLayerPaintingInfo& localPaintingInfo, |
LayoutObject* paintingRootForLayoutObject, PaintLayerFlags paintFlags) |
{ |
bool needsScope = layerFragments.size() > 1; |
for (auto& fragment: layerFragments) { |
Optional<ScopeRecorder> scopeRecorder; |
if (needsScope) |
- scopeRecorder.emplace(*context); |
+ scopeRecorder.emplace(context); |
paintFragmentWithPhase(PaintPhaseClippingMask, fragment, context, fragment.foregroundRect, localPaintingInfo, paintingRootForLayoutObject, paintFlags, HasNotClipped); |
} |
} |
-void PaintLayerPainter::paintOverlayScrollbars(GraphicsContext* context, const LayoutRect& damageRect, const GlobalPaintFlags paintFlags, LayoutObject* paintingRoot) |
+void PaintLayerPainter::paintOverlayScrollbars(GraphicsContext& context, const LayoutRect& damageRect, const GlobalPaintFlags paintFlags, LayoutObject* paintingRoot) |
{ |
if (!m_paintLayer.containsDirtyOverlayScrollbars()) |
return; |