Simplify RenderLayer's handling of filters.

sky/engine/core/rendering/RenderLayer.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 30 matching lines @@
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #ifndef SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_
 #define SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_
 
 #include "sky/engine/core/rendering/LayerPaintingInfo.h"
 #include "sky/engine/core/rendering/RenderBox.h"
 #include "sky/engine/core/rendering/RenderLayerClipper.h"
-#include "sky/engine/core/rendering/RenderLayerFilterInfo.h"
 #include "sky/engine/core/rendering/RenderLayerStackingNode.h"
 #include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
 #include "sky/engine/public/platform/WebBlendMode.h"
 #include "sky/engine/wtf/OwnPtr.h"
 
 namespace blink {
 
 class FilterEffectRenderer;
 class FilterOperations;
 class HitTestRequest;
@@ skipping 77 matching lines @@
 
     // FIXME: reflections should force transform-style to be flat in the style: https://bugs.webkit.org/show_bug.cgi?id=106959
     bool shouldPreserve3D() const { return renderer()->style()->transformStyle3D() == TransformStyle3DPreserve3D; }
 
     void* operator new(size_t);
     // Only safe to call from RenderBox::destroyLayer()
     void operator delete(void*);
 
     FilterEffectRenderer* filterRenderer() const
     {
-        RenderLayerFilterInfo* filterInfo = this->filterInfo();
-        return filterInfo ? filterInfo->renderer() : 0;
+        return m_filterRenderer.get();
     }
 
-    RenderLayerFilterInfo* filterInfo() const { return hasFilterInfo() ? RenderLayerFilterInfo::filterInfoForRenderLayer(this) : 0; }
-    RenderLayerFilterInfo* ensureFilterInfo() { return RenderLayerFilterInfo::createFilterInfoForRenderLayerIfNeeded(this); }
-    void removeFilterInfoIfNeeded()
-    {
-        if (hasFilterInfo())
-            RenderLayerFilterInfo::removeFilterInfoForRenderLayer(this);
-    }
-
-    bool hasFilterInfo() const { return m_hasFilterInfo; }
-    void setHasFilterInfo(bool hasFilterInfo) { m_hasFilterInfo = hasFilterInfo; }
-
     RenderLayerClipper& clipper() { return m_clipper; }
     const RenderLayerClipper& clipper() const { return m_clipper; }
 
     inline bool isPositionedContainer() const
     {
         // FIXME: This is not in sync with containingBlock.
         return isRootLayer() || renderer()->isPositioned() || renderer()->hasTransform();
     }
 
     void clipToRect(const LayerPaintingInfo&, GraphicsContext*, const ClipRect&, BorderRadiusClippingRule = IncludeSelfForBorderRadius);
@@ skipping 22 matching lines @@
     // FIXME(crbug.com/332791): Self-painting layer should be merged into the overflow-only concept.
     unsigned m_isSelfPaintingLayer : 1;
 
     const unsigned m_isRootLayer : 1;
 
     unsigned m_3DTransformedDescendantStatusDirty : 1;
     // Set on a stacking context layer that has 3D descendants anywhere
     // in a preserves3D hierarchy. Hint to do 3D-aware hit testing.
     unsigned m_has3DTransformedDescendant : 1;
 
-    unsigned m_hasFilterInfo : 1;
-
     RenderBox* m_renderer;
 
     RenderLayer* m_parent;
     RenderLayer* m_previous;
     RenderLayer* m_next;
     RenderLayer* m_first;
     RenderLayer* m_last;
 
     OwnPtr<TransformationMatrix> m_transform;
+    OwnPtr<FilterEffectRenderer> m_filterRenderer;
 
     RenderLayerClipper m_clipper; // FIXME: Lazily allocate?
     OwnPtr<RenderLayerStackingNode> m_stackingNode;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDERLAYER_H_