| Index: sky/engine/core/rendering/RenderLayer.h
|
| diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
|
| index 704179deac336c24f2b8bb3692658638f9ac82a2..b2e5c630af2292399a8ba13f3dd31efd3fbfc36f 100644
|
| --- a/sky/engine/core/rendering/RenderLayer.h
|
| +++ b/sky/engine/core/rendering/RenderLayer.h
|
| @@ -65,7 +65,6 @@ class FilterOperations;
|
| class HitTestRequest;
|
| class HitTestResult;
|
| class HitTestingTransformState;
|
| -class CompositedLayerMapping;
|
| class RenderLayerCompositor;
|
| class RenderStyle;
|
| class TransformationMatrix;
|
| @@ -270,19 +269,7 @@ public:
|
| // compositing state may legally be read.
|
| bool isAllowedToQueryCompositingState() const;
|
|
|
| - // Don't null check this.
|
| - CompositedLayerMapping* compositedLayerMapping() const;
|
| - // FIXME: This should return a reference.
|
| - CompositedLayerMapping* ensureCompositedLayerMapping();
|
| GraphicsLayer* graphicsLayerBacking() const;
|
| - // NOTE: If you are using hasCompositedLayerMapping to determine the state of compositing for this layer,
|
| - // (and not just to do bookkeeping related to the mapping like, say, allocating or deallocating a mapping),
|
| - // then you may have incorrect logic. Use compositingState() instead.
|
| - // FIXME: This is identical to null checking compositedLayerMapping(), why not just call that?
|
| - bool hasCompositedLayerMapping() const { return m_compositedLayerMapping.get(); }
|
| - void clearCompositedLayerMapping(bool layerBeingDestroyed = false);
|
| - CompositedLayerMapping* groupedMapping() const { return m_groupedMapping; }
|
| - void setGroupedMapping(CompositedLayerMapping* groupedMapping, bool layerBeingDestroyed = false);
|
|
|
| bool hasCompositedMask() const;
|
| bool hasCompositedClippingMask() const;
|
| @@ -639,11 +626,8 @@ private:
|
|
|
| IntRect m_blockSelectionGapsBounds;
|
|
|
| - OwnPtr<CompositedLayerMapping> m_compositedLayerMapping;
|
| OwnPtr<RenderLayerScrollableArea> m_scrollableArea;
|
|
|
| - CompositedLayerMapping* m_groupedMapping;
|
| -
|
| RenderLayerRepainter m_paintInvalidator;
|
| RenderLayerClipper m_clipper; // FIXME: Lazily allocate?
|
| OwnPtr<RenderLayerStackingNode> m_stackingNode;
|
|
|