| Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| index 72cdc71f262586e46fe0df356fcf1e8ab8d21d7b..263634c96d5b147266a773ec803c62f833cc8457 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -2280,10 +2280,10 @@ void CompositedLayerMapping::doPaintTask(const GraphicsLayerPaintInfo& paintInfo
|
| // FIXME: Is it correct to clip to dirtyRect in slimming paint mode?
|
| // FIXME: Combine similar code here and LayerClipRecorder.
|
| dirtyRect.intersect(paintInfo.localClipRectForSquashedLayer);
|
| - context.getPaintController().createAndAppend<ClipDisplayItem>(graphicsLayer, DisplayItem::ClipLayerOverflowControls, dirtyRect);
|
| + context.getPaintController().createAndAppend<ClipDisplayItem>(graphicsLayer, DisplayItem::kClipLayerOverflowControls, dirtyRect);
|
|
|
| PaintLayerPainter(*paintInfo.paintLayer).paintLayer(context, paintingInfo, paintLayerFlags);
|
| - context.getPaintController().endItem<EndClipDisplayItem>(graphicsLayer, DisplayItem::clipTypeToEndClipType(DisplayItem::ClipLayerOverflowControls));
|
| + context.getPaintController().endItem<EndClipDisplayItem>(graphicsLayer, DisplayItem::clipTypeToEndClipType(DisplayItem::kClipLayerOverflowControls));
|
| }
|
| }
|
|
|
| @@ -2510,7 +2510,7 @@ void CompositedLayerMapping::paintScrollableArea(const GraphicsLayer* graphicsLa
|
| // Note the composited scrollable area painted here is never associated with a frame. For
|
| // painting frame ScrollableAreas, see PaintLayerCompositor::paintContents.
|
|
|
| - if (DrawingRecorder::useCachedDrawingIfPossible(context, *graphicsLayer, DisplayItem::ScrollbarCompositedScrollbar))
|
| + if (DrawingRecorder::useCachedDrawingIfPossible(context, *graphicsLayer, DisplayItem::kScrollbarCompositedScrollbar))
|
| return;
|
|
|
| FloatRect layerBounds(FloatPoint(), graphicsLayer->size());
|
| @@ -2530,7 +2530,7 @@ void CompositedLayerMapping::paintScrollableArea(const GraphicsLayer* graphicsLa
|
| // Replay the painted scrollbar content with the GraphicsLayer backing as the DisplayItemClient
|
| // in order for the resulting DrawingDisplayItem to produce the correct visualRect (i.e., the
|
| // bounds of the involved GraphicsLayer).
|
| - DrawingRecorder drawingRecorder(context, *graphicsLayer, DisplayItem::ScrollbarCompositedScrollbar, layerBounds);
|
| + DrawingRecorder drawingRecorder(context, *graphicsLayer, DisplayItem::kScrollbarCompositedScrollbar, layerBounds);
|
| pictureBuilder.endRecording()->playback(context.canvas());
|
| }
|
|
|
|
|