| Index: sky/engine/core/rendering/RenderLayer.h
|
| diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
|
| index 5a32362ef84a1708af87f59be21d5611fc590ec6..37e8e34ece0dbb8e04436d5b4f56d2ff629e2b84 100644
|
| --- a/sky/engine/core/rendering/RenderLayer.h
|
| +++ b/sky/engine/core/rendering/RenderLayer.h
|
| @@ -54,7 +54,6 @@
|
| #include "sky/engine/core/rendering/RenderLayerScrollableArea.h"
|
| #include "sky/engine/core/rendering/RenderLayerStackingNode.h"
|
| #include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
|
| -#include "sky/engine/core/rendering/compositing/CompositingState.h"
|
| #include "sky/engine/platform/graphics/CompositingReasons.h"
|
| #include "sky/engine/public/platform/WebBlendMode.h"
|
| #include "sky/engine/wtf/OwnPtr.h"
|
| @@ -261,9 +260,6 @@ public:
|
| // Only safe to call from RenderLayerModelObject::destroyLayer()
|
| void operator delete(void*);
|
|
|
| - // FIXME(sky): Remove
|
| - CompositingState compositingState() const { return NotComposited; }
|
| -
|
| GraphicsLayer* graphicsLayerBacking() const;
|
|
|
| bool hasCompositedMask() const;
|
| @@ -287,7 +283,8 @@ public:
|
|
|
| bool paintsWithTransparency(PaintBehavior paintBehavior) const
|
| {
|
| - return isTransparent() && ((paintBehavior & PaintBehaviorFlattenCompositingLayers) || compositingState() != PaintsIntoOwnBacking);
|
| + // FIXME(sky): Remove
|
| + return isTransparent();
|
| }
|
|
|
| bool paintsWithTransform(PaintBehavior) const;
|
| @@ -493,10 +490,6 @@ private:
|
| void paintLayerContentsAndReflection(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
|
| void paintLayerByApplyingTransform(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags, const LayoutPoint& translationOffset = LayoutPoint());
|
|
|
| - // Returns whether this layer should be painted during sofware painting (i.e., not via calls from CompositedLayerMapping to draw into composited
|
| - // layers).
|
| - bool shouldPaintLayerInSoftwareMode(const LayerPaintingInfo&, PaintLayerFlags paintFlags);
|
| -
|
| void paintChildren(unsigned childrenToVisit, GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
|
|
|
| void collectFragments(LayerFragments&, const RenderLayer* rootLayer, const LayoutRect& dirtyRect,
|
|
|