Move ReferenceFilterBuilder::build to FilterEffectBuilder

third_party/WebKit/Source/core/paint/PaintLayer.cpp

Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index e8298b6a75c22d627e35bf71ece225baed188a53..f4eeee797ae5a8b7ea851523977fe9e47e919e80 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -66,7 +66,6 @@
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
-#include "core/layout/svg/ReferenceFilterBuilder.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/paint/BoxReflectionUtils.h"
@@ -2655,11 +2654,10 @@ FilterOperations computeFilterOperationsHandleReferenceFilters(const FilterOpera
                 continue;
             ReferenceFilterOperation& referenceOperation = toReferenceFilterOperation(*filterOperation);
             // FIXME: Cache the Filter if it didn't change.
-            Filter* referenceFilter = ReferenceFilterBuilder::build(effectiveZoom, toElement(enclosingNode), nullptr, referenceOperation);
+            Filter* referenceFilter = FilterEffectBuilder::buildReferenceFilter(referenceOperation, nullptr, nullptr, nullptr, *toElement(enclosingNode), nullptr, effectiveZoom);
             referenceOperation.setFilter(referenceFilter);
         }
     }
-
     return filters;
 }
 
@@ -2735,8 +2733,8 @@ FilterEffectBuilder* PaintLayer::updateFilterEffectBuilder() const
 
     filterInfo->setBuilder(FilterEffectBuilder::create());
 
-    float zoom = layoutObject()->style() ? layoutObject()->style()->effectiveZoom() : 1.0f;
-    if (!filterInfo->builder()->build(toElement(enclosingNode()), computeFilterOperations(layoutObject()->styleRef()), zoom))
+    const ComputedStyle& style = layoutObject()->styleRef();

[Stephen White, 2016/06/08 13:53:45]

<rambling> I could be misremembering, but IIRC this didn't used to work with
filter nodes loaded in external documents. But maybe it does now. At any rate,
it's a reference so it's non-null, even if the style isn't up-to-date.
</rambling>

[fs, 2016/06/08 14:08:41]

This is the style of whatever LayoutBox the PaintLayer is associated with, so
it's not related to the actual filter node (if any). At this point we'll have
indirectly null-checked it regardless (via paintsWithFilter IIRC.) Also, the
window where layoutObject() is non-null but style() isn't is not one where we'll
be calling this method.

+    if (!filterInfo->builder()->build(toElement(enclosingNode()), computeFilterOperations(style), style.effectiveZoom()))
         filterInfo->setBuilder(nullptr);
 
     return filterInfo->builder();