| Index: Source/core/rendering/RenderLayer.h
|
| diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h
|
| index 5597613b1426b0c09ee9549af83371c9dbc2a8ba..262248a47806cf0158478960f141d362a4f76472 100644
|
| --- a/Source/core/rendering/RenderLayer.h
|
| +++ b/Source/core/rendering/RenderLayer.h
|
| @@ -169,18 +169,17 @@ public:
|
| enum UpdateLayerPositionsFlag {
|
| CheckForRepaint = 1 << 0,
|
| NeedsFullRepaintInBacking = 1 << 1,
|
| - IsCompositingUpdateRoot = 1 << 2,
|
| - UpdateCompositingLayers = 1 << 3,
|
| - UpdatePagination = 1 << 4
|
| + UpdatePagination = 1 << 2,
|
| };
|
| typedef unsigned UpdateLayerPositionsFlags;
|
| - static const UpdateLayerPositionsFlags defaultFlags = CheckForRepaint | IsCompositingUpdateRoot | UpdateCompositingLayers;
|
|
|
| void updateLayerPositionsAfterLayout(const RenderLayer* rootLayer, UpdateLayerPositionsFlags);
|
| -
|
| void updateLayerPositionsAfterOverflowScroll();
|
| void updateLayerPositionsAfterDocumentScroll();
|
|
|
| + // FIXME: Should updateLayerPositions be private?
|
| + void updateLayerPositions(RenderGeometryMap*, UpdateLayerPositionsFlags = CheckForRepaint);
|
| +
|
| bool isPaginated() const { return m_isPaginated; }
|
| RenderLayer* enclosingPaginationLayer() const { return m_enclosingPaginationLayer; }
|
|
|
| @@ -509,8 +508,6 @@ public:
|
|
|
| void updateOrRemoveFilterEffectRenderer();
|
|
|
| - void updateLayerPositions(RenderGeometryMap* = 0, UpdateLayerPositionsFlags = defaultFlags);
|
| -
|
| void updateSelfPaintingLayer();
|
|
|
| void paintLayerContents(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
|
|
|