1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp b/chromium/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp
index 03ed1f439c3..3bd7991f542 100644
--- a/chromium/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp
+++ b/chromium/third_party/WebKit/Source/platform/graphics/filters/FEFlood.cpp
@@ -40,7 +40,6 @@ FEFlood::FEFlood(Filter* filter, const Color& floodColor, float floodOpacity)
     , m_floodOpacity(floodOpacity)
 {
     FilterEffect::setOperatingColorSpace(ColorSpaceDeviceRGB);
-    FilterEffect::setResultColorSpace(ColorSpaceDeviceRGB);
 }
 
 PassRefPtr<FEFlood> FEFlood::create(Filter* filter, const Color& floodColor, float floodOpacity)
@@ -80,13 +79,14 @@ void FEFlood::applySoftware()
     if (!resultImage)
         return;
 
-    Color color = colorWithOverrideAlpha(floodColor().rgb(), floodOpacity());
+    Color color = floodColor().combineWithAlpha(floodOpacity());
     resultImage->context()->fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), color);
+    FilterEffect::setResultColorSpace(ColorSpaceDeviceRGB);
 }
 
 PassRefPtr<SkImageFilter> FEFlood::createImageFilter(SkiaImageFilterBuilder* builder)
 {
-    Color color = colorWithOverrideAlpha(floodColor().rgb(), floodOpacity());
+    Color color = floodColor().combineWithAlpha(floodOpacity());
 
     SkImageFilter::CropRect rect = getCropRect(builder->cropOffset());
     SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(color.rgb(), SkXfermode::kSrc_Mode));