Support colors w/ alpha in SVG 'stop' elements and 'feFlood'

Source/platform/graphics/filters/FEFlood.cpp

Index: Source/platform/graphics/filters/FEFlood.cpp
diff --git a/Source/platform/graphics/filters/FEFlood.cpp b/Source/platform/graphics/filters/FEFlood.cpp
index 92b62bc80c3a254d54d3ec2f3b79726c953c9c39..3bd7991f5423a159fd2c77ca097c589457c30f38 100644
--- a/Source/platform/graphics/filters/FEFlood.cpp
+++ b/Source/platform/graphics/filters/FEFlood.cpp
@@ -79,14 +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));