From 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 Mon Sep 17 00:00:00 2001 From: Andrei Popescu Date: Wed, 19 Aug 2009 14:09:30 +0100 Subject: Revert "Merge WebKit r47420" This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. --- WebCore/rendering/RenderLayerBacking.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'WebCore/rendering/RenderLayerBacking.h') diff --git a/WebCore/rendering/RenderLayerBacking.h b/WebCore/rendering/RenderLayerBacking.h index 731e741..b027685 100644 --- a/WebCore/rendering/RenderLayerBacking.h +++ b/WebCore/rendering/RenderLayerBacking.h @@ -63,23 +63,21 @@ public: // Update contents and clipping structure. void updateInternalHierarchy(); // make private - GraphicsLayer* graphicsLayer() const { return m_graphicsLayer.get(); } + GraphicsLayer* graphicsLayer() const { return m_graphicsLayer; } // Layer to clip children bool hasClippingLayer() const { return m_clippingLayer != 0; } - GraphicsLayer* clippingLayer() const { return m_clippingLayer.get(); } + GraphicsLayer* clippingLayer() const { return m_clippingLayer; } // Layer to get clipped by ancestor bool hasAncestorClippingLayer() const { return m_ancestorClippingLayer != 0; } - GraphicsLayer* ancestorClippingLayer() const { return m_ancestorClippingLayer.get(); } + GraphicsLayer* ancestorClippingLayer() const { return m_ancestorClippingLayer; } bool hasContentsLayer() const { return m_foregroundLayer != 0; } - GraphicsLayer* foregroundLayer() const { return m_foregroundLayer.get(); } + GraphicsLayer* foregroundLayer() const { return m_foregroundLayer; } - bool hasMaskLayer() const { return m_maskLayer != 0; } - - GraphicsLayer* parentForSublayers() const { return m_clippingLayer ? m_clippingLayer.get() : m_graphicsLayer.get(); } - GraphicsLayer* childForSuperlayers() const { return m_ancestorClippingLayer ? m_ancestorClippingLayer.get() : m_graphicsLayer.get(); } + GraphicsLayer* parentForSublayers() const { return m_clippingLayer ? m_clippingLayer : m_graphicsLayer; } + GraphicsLayer* childForSuperlayers() const { return m_ancestorClippingLayer ? m_ancestorClippingLayer : m_graphicsLayer; } // RenderLayers with backing normally short-circuit paintLayer() because // their content is rendered via callbacks from GraphicsLayer. However, the document @@ -129,10 +127,7 @@ private: bool updateClippingLayers(bool needsAncestorClip, bool needsDescendantClip); bool updateForegroundLayer(bool needsForegroundLayer); - bool updateMaskLayer(bool needsMaskLayer); - GraphicsLayerPaintingPhase paintingPhaseForPrimaryLayer() const; - IntSize contentOffsetInCompostingLayer() const; // Result is transform origin in pixels. FloatPoint3D computeTransformOrigin(const IntRect& borderBox) const; @@ -167,11 +162,10 @@ private: private: RenderLayer* m_owningLayer; - OwnPtr m_ancestorClippingLayer; // only used if we are clipped by an ancestor which is not a stacking context - OwnPtr m_graphicsLayer; - OwnPtr m_foregroundLayer; // only used in cases where we need to draw the foreground separately - OwnPtr m_clippingLayer; // only used if we have clipping on a stacking context, with compositing children - OwnPtr m_maskLayer; // only used if we have a mask + GraphicsLayer* m_ancestorClippingLayer; // only used if we are clipped by an ancestor which is not a stacking context + GraphicsLayer* m_graphicsLayer; + GraphicsLayer* m_foregroundLayer; // only used in cases where we need to draw the foreground separately + GraphicsLayer* m_clippingLayer; // only used if we have clipping on a stacking context, with compositing children IntRect m_compositedBounds; -- cgit v1.1