Let clients of FilterEffectBuilder compute/provide the reference-box

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

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/paint/FilterEffectBuilder.h"
 
 #include "core/layout/svg/ReferenceFilterBuilder.h"
-#include "core/paint/PaintLayer.h"
 #include "core/svg/SVGFilterElement.h"
 #include "core/svg/SVGLengthContext.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 #include "platform/LengthFunctions.h"
 #include "platform/graphics/ColorSpace.h"
 #include "platform/graphics/filters/FEBoxReflect.h"
 #include "platform/graphics/filters/FEColorMatrix.h"
 #include "platform/graphics/filters/FEComponentTransfer.h"
 #include "platform/graphics/filters/FEDropShadow.h"
 #include "platform/graphics/filters/FEGaussianBlur.h"
@@ skipping 71 matching lines @@
 
     matrix.uncheckedAppend(clampTo<float>(0.272 - 0.272 * oneMinusAmount));
     matrix.uncheckedAppend(clampTo<float>(0.534 - 0.534 * oneMinusAmount));
     matrix.uncheckedAppend(clampTo<float>(0.131 + 0.869 * oneMinusAmount));
     endMatrixRow(matrix);
 
     lastMatrixRow(matrix);
     return matrix;
 }
 
-FloatRect computeReferenceBox(const Element& element, const FloatSize* zoomedReferenceBoxSize, float zoom)
-{
-    FloatRect box;
-    if (zoomedReferenceBoxSize) {
-        box = FloatRect(FloatPoint(), *zoomedReferenceBoxSize);
-    } else if (element.isConnected() && element.layoutObject() && element.layoutObject()->enclosingLayer()) {
-        box = FloatRect(element.layoutObject()->enclosingLayer()->physicalBoundingBoxIncludingReflectionAndStackingChildren(LayoutPoint(), PaintLayer::CalculateBoundsOptions::IncludeTransformsAndCompositedChildLayers));
-    }
-    box.scale(1.0f / zoom);
-    return box;
-}
-
 } // namespace
 
 FilterEffectBuilder::FilterEffectBuilder()
 {
 }
 
 FilterEffectBuilder::~FilterEffectBuilder()
 {
 }
 
 DEFINE_TRACE(FilterEffectBuilder)
 {
     visitor->trace(m_lastEffect);
 }
 
-bool FilterEffectBuilder::build(Element* element, const FilterOperations& operations, float zoom, const FloatSize* zoomedReferenceBoxSize, const SkPaint* fillPaint, const SkPaint* strokePaint)
+bool FilterEffectBuilder::build(Element* element, const FilterOperations& operations, float zoom, const FloatRect& zoomedReferenceBox, const SkPaint* fillPaint, const SkPaint* strokePaint)
 {
     // Create a parent filter for shorthand filters. These have already been scaled by the CSS code for page zoom, so scale is 1.0 here.
     Filter* parentFilter = Filter::create(1.0f);
     FilterEffect* previousEffect = parentFilter->getSourceGraphic();
     for (size_t i = 0; i < operations.operations().size(); ++i) {
         FilterEffect* effect = nullptr;
         FilterOperation* filterOperation = operations.operations().at(i).get();
         switch (filterOperation->type()) {
         case FilterOperation::REFERENCE: {
-            Filter* referenceFilter = buildReferenceFilter(toReferenceFilterOperation(*filterOperation), zoomedReferenceBoxSize, fillPaint, strokePaint, *element, previousEffect, zoom);
+            Filter* referenceFilter = buildReferenceFilter(toReferenceFilterOperation(*filterOperation), zoomedReferenceBox, fillPaint, strokePaint, *element, previousEffect, zoom);
             if (referenceFilter)
                 effect = referenceFilter->lastEffect();
             break;
         }
         case FilterOperation::GRAYSCALE: {
             Vector<float> inputParameters = grayscaleMatrix(toBasicColorMatrixFilterOperation(filterOperation)->amount());
             effect = FEColorMatrix::create(parentFilter, FECOLORMATRIX_TYPE_MATRIX, inputParameters);
             break;
         }
         case FilterOperation::SEPIA: {
@@ skipping 100 matching lines @@
 
     // If we didn't make any effects, tell our caller we are not valid
     if (!m_lastEffect.get())
         return false;
 
     return true;
 }
 
 Filter* FilterEffectBuilder::buildReferenceFilter(
     const ReferenceFilterOperation& referenceOperation,
-    const FloatSize* zoomedReferenceBoxSize,
+    const FloatRect& zoomedReferenceBox,
     const SkPaint* fillPaint,
     const SkPaint* strokePaint,
     Element& element,
     FilterEffect* previousEffect,
     float zoom)
 {
     SVGFilterElement* filterElement = ReferenceFilterBuilder::resolveFilterReference(referenceOperation, element);
     if (!filterElement)
         return nullptr;
-
-    const FloatRect referenceBox = computeReferenceBox(element, zoomedReferenceBoxSize, zoom);
+    FloatRect referenceBox = zoomedReferenceBox;
+    referenceBox.scale(1.0f / zoom);
     return buildReferenceFilter(*filterElement, referenceBox, fillPaint, strokePaint, previousEffect, zoom);
 }
 
 Filter* FilterEffectBuilder::buildReferenceFilter(
     SVGFilterElement& filterElement,
     const FloatRect& referenceBox,
     const SkPaint* fillPaint,
     const SkPaint* strokePaint,
     FilterEffect* previousEffect,
     float zoom,
@@ skipping 12 matching lines @@
     if (!previousEffect)
         previousEffect = result->getSourceGraphic();
     SVGFilterBuilder builder(previousEffect, nodeMap, fillPaint, strokePaint);
     builder.buildGraph(result, filterElement, referenceBox);
     result->setLastEffect(builder.lastEffect());
     return result;
 }
 
 } // namespace blink