Move FilterEffectRenderer out of RenderLayer into RenderBox.

sky/engine/core/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 19 matching lines @@
 #include <algorithm>
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/frame/FrameHost.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLElement.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/Page.h"
-#include "sky/engine/core/rendering/FilterEffectRenderer.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/HitTestingTransformState.h"
 #include "sky/engine/core/rendering/PaintInfo.h"
 #include "sky/engine/core/rendering/RenderFlexibleBox.h"
 #include "sky/engine/core/rendering/RenderGeometryMap.h"
 #include "sky/engine/core/rendering/RenderInline.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/platform/LengthFunctions.h"
 #include "sky/engine/platform/geometry/FloatQuad.h"
@@ skipping 114 matching lines @@
 
     if (isRenderView()) {
         // TODO(ojan): Merge this into the same call above.
         setHasBoxDecorationBackground(true);
     } else if (isRenderBlock()) {
         // TODO(esprehn): Why do we not want to set this on the RenderView?
         setHasOverflowClip(!styleToUse->isOverflowVisible());
     }
 
     setHasTransform(styleToUse->hasTransformRelatedProperty());
+    updateFilters();
+}
+
+void RenderBox::updateFilters()
+{
+    if (!style()->hasFilter()) {
+        m_filterRenderer = nullptr;
+        return;
+    }
+
+    m_filterRenderer = FilterEffectRenderer::create();
+
+    // If the filter fails to build, remove it from the layer. It will still attempt to
+    // go through regular processing (e.g. compositing), but never apply anything.
+    if (!m_filterRenderer->build(this, style()->filter()))
+        m_filterRenderer = nullptr;
 }
 
 void RenderBox::layout()
 {
     ASSERT(needsLayout());
 
     RenderObject* child = slowFirstChild();
     if (!child) {
         clearNeedsLayout();
         return;
@@ skipping 664 matching lines @@
     if (isTransparent()) {
         context->save();
         LayoutRect clipRect = intersection(paintingInfo.paintDirtyRect,
             transparencyClipBox(layer(), localPaintingInfo.rootLayer, localPaintingInfo.subPixelAccumulation));
         context->clip(clipRect);
         context->beginTransparencyLayer(opacity());
     }
 
     layer()->clipToRect(localPaintingInfo, context, contentRect);
 
-    FilterEffectRendererHelper filterPainter(layer()->filterRenderer() && hasFilter());
+    FilterEffectRendererHelper filterPainter(m_filterRenderer && style()->hasFilter());
 
     if (filterPainter.haveFilterEffect()) {
         if (!rootRelativeBoundsComputed)
             rootRelativeBounds = layer()->physicalBoundingBoxIncludingReflectionAndStackingChildren(paintingInfo.rootLayer, offsetFromRoot);
 
-        if (filterPainter.prepareFilterEffect(layer(), rootRelativeBounds, paintingInfo.paintDirtyRect))
+        if (filterPainter.prepareFilterEffect(m_filterRenderer.get(), rootRelativeBounds, paintingInfo.paintDirtyRect))
             context = filterPainter.beginFilterEffect(context);
     }
 
     LayoutPoint layerLocation = toPoint(layerBounds.location() - location() + localPaintingInfo.subPixelAccumulation);
 
     Vector<RenderBox*> layers;
     PaintInfo paintInfo(context, pixelSnappedIntRect(contentRect.rect()), localPaintingInfo.rootLayer->renderer());
     paint(paintInfo, layerLocation, layers);
 
     std::stable_sort(layers.begin(), layers.end(), forwardCompareZIndex);
@@ skipping 2147 matching lines @@
 
 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
 {
     backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
     hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
     ASSERT(hasBackground == style.hasBackground());
     hasBorder = style.hasBorder();
 }
 
 } // namespace blink