1 files changed, 3 insertions, 21 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp b/chromium/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp
index d2692bd3167..08c8709ffab 100644
--- a/chromium/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp
+++ b/chromium/third_party/WebKit/Source/platform/graphics/filters/FilterOperations.cpp
@@ -34,14 +34,12 @@ namespace WebCore {
 
 static inline IntSize outsetSizeForBlur(float stdDeviation)
 {
-    unsigned kernelSizeX = 0;
-    unsigned kernelSizeY = 0;
-    FEGaussianBlur::calculateUnscaledKernelSize(kernelSizeX, kernelSizeY, stdDeviation, stdDeviation);
+    IntSize kernelSize = FEGaussianBlur::calculateUnscaledKernelSize(FloatPoint(stdDeviation, stdDeviation));
 
     IntSize outset;
     // We take the half kernel size and multiply it with three, because we run box blur three times.
-    outset.setWidth(3 * kernelSizeX * 0.5f);
-    outset.setHeight(3 * kernelSizeY * 0.5f);
+    outset.setWidth(3 * kernelSize.width() * 0.5f);
+    outset.setHeight(3 * kernelSize.height() * 0.5f);
 
     return outset;
 }
@@ -90,16 +88,6 @@ bool FilterOperations::canInterpolateWith(const FilterOperations& other) const
     return true;
 }
 
-bool FilterOperations::hasCustomFilter() const
-{
-    for (size_t i = 0; i < m_operations.size(); ++i) {
-        FilterOperation::OperationType type = m_operations.at(i)->type();
-        if (type == FilterOperation::CUSTOM || type == FilterOperation::VALIDATED_CUSTOM)
-            return true;
-    }
-    return false;
-}
-
 bool FilterOperations::hasReferenceFilter() const
 {
     for (size_t i = 0; i < m_operations.size(); ++i) {
@@ -160,12 +148,6 @@ FilterOutsets FilterOperations::outsets() const
             }
             break;
         }
-        case FilterOperation::CUSTOM:
-        case FilterOperation::VALIDATED_CUSTOM: {
-            // FIXME: Need to include the filter margins here.
-            // https://bugs.webkit.org/show_bug.cgi?id=71400
-            break;
-        }
         default:
             break;
         }