Move buildFilterOperations to FilterEffectBuilder

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 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>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 2671 matching lines @@
 }
 
 bool PaintLayer::scrollsOverflow() const
 {
     if (PaintLayerScrollableArea* scrollableArea = this->getScrollableArea())
         return scrollableArea->scrollsOverflow();
 
     return false;
 }
 
-namespace {
-
-FilterOperations resolveReferenceFilters(const FilterEffectBuilder& builder, const FilterOperations& filters)
-{
-    DCHECK(filters.hasReferenceFilter());
-
-    for (FilterOperation* filterOperation : filters.operations()) {
-        if (filterOperation->type() != FilterOperation::REFERENCE)
-            continue;
-        ReferenceFilterOperation& referenceOperation = toReferenceFilterOperation(*filterOperation);
-        // TODO(fs): Cache the Filter if it didn't change.
-        referenceOperation.setFilter(builder.buildReferenceFilter(referenceOperation));
-    }
-    return filters;
-}
-
-} // unnamed namespace
-
 FilterOperations PaintLayer::addReflectionToFilterOperations(const ComputedStyle& style) const
 {
     FilterOperations filterOperations = style.filter();
     if (RuntimeEnabledFeatures::cssBoxReflectFilterEnabled() && layoutObject()->hasReflection() && layoutObject()->isBox()) {
         BoxReflection reflection = boxReflectionForPaintLayer(*this, style);
         filterOperations.operations().append(BoxReflectFilterOperation::create(reflection));
     }
     return filterOperations;
 }
 
 CompositorFilterOperations PaintLayer::createCompositorFilterOperationsForFilter(const ComputedStyle& style)
 {
-    FilterOperations filterOperations = addReflectionToFilterOperations(style);
-    if (filterOperations.hasReferenceFilter()) {
-        FilterEffectBuilder builder(toElement(enclosingNode()), boxForFilter(), style.effectiveZoom());
-        filterOperations = resolveReferenceFilters(builder, filterOperations);
-    }
-    return SkiaImageFilterBuilder::buildFilterOperations(filterOperations);
+    FloatRect zoomedReferenceBox;
+    if (style.filter().hasReferenceFilter())
+        zoomedReferenceBox = boxForFilter();
+    FilterEffectBuilder builder(enclosingNode(), zoomedReferenceBox, style.effectiveZoom());
+    return builder.buildFilterOperations(addReflectionToFilterOperations(style));
 }
 
 CompositorFilterOperations PaintLayer::createCompositorFilterOperationsForBackdropFilter(const ComputedStyle& style)
 {
-    FilterOperations operations = style.backdropFilter();
-    if (operations.hasReferenceFilter()) {
-        FilterEffectBuilder builder(toElement(enclosingNode()), boxForFilter(), style.effectiveZoom());
-        operations = resolveReferenceFilters(builder, operations);
-    }
-    return SkiaImageFilterBuilder::buildFilterOperations(operations);
+    FloatRect zoomedReferenceBox;
+    if (style.backdropFilter().hasReferenceFilter())
+        zoomedReferenceBox = boxForFilter();
+    FilterEffectBuilder builder(enclosingNode(), zoomedReferenceBox, style.effectiveZoom());
+    return builder.buildFilterOperations(style.backdropFilter());
 }
 
 PaintLayerFilterInfo& PaintLayer::ensureFilterInfo()
 {
     PaintLayerRareData& rareData = ensureRareData();
     if (!rareData.filterInfo)
         rareData.filterInfo = new PaintLayerFilterInfo(this);
     return *rareData.filterInfo;
 }
 
@@ skipping 40 matching lines @@
 
     PaintLayerFilterInfo* filterInfo = this->filterInfo();
 
     // Should have been added by updateOrRemoveFilterEffect().
     ASSERT(filterInfo);
 
     if (filterInfo->lastEffect())
         return filterInfo->lastEffect();
 
     const ComputedStyle& style = layoutObject()->styleRef();
-    const bool hasReferenceFilter = style.filter().hasReferenceFilter();
     FloatRect zoomedReferenceBox;
-    if (hasReferenceFilter)
+    if (style.filter().hasReferenceFilter())
         zoomedReferenceBox = boxForFilter();
-
-    FilterOperations operations = addReflectionToFilterOperations(style);
-    FilterEffectBuilder builder(toElement(enclosingNode()), zoomedReferenceBox, style.effectiveZoom());
-    if (hasReferenceFilter)
-        operations = resolveReferenceFilters(builder, operations);
-
-    filterInfo->setLastEffect(builder.buildFilterEffect(operations));
+    FilterEffectBuilder builder(enclosingNode(), zoomedReferenceBox, style.effectiveZoom());
+    filterInfo->setLastEffect(builder.buildFilterEffect(addReflectionToFilterOperations(style)));
     return filterInfo->lastEffect();
 }
 
 FilterEffect* PaintLayer::lastFilterEffect() const
 {
     return updateFilterEffect();
 }
 
 FloatRect PaintLayer::mapRectForFilter(const FloatRect& rect) const
 {
@@ skipping 187 matching lines @@
 
 void showLayerTree(const blink::LayoutObject* layoutObject)
 {
     if (!layoutObject) {
         fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n");
         return;
     }
     showLayerTree(layoutObject->enclosingLayer());
 }
 #endif