Attachment 346571 Details for Bug 188325 – Patch

[patch] Patch

bug-188325-20180803181008.patch (text/plain), 55.02 KB, created by Alex Christensen on 2018-08-03 18:10:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-03 18:10:09 PDT

Size: 55.02 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 234514)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,87 @@
>+2018-08-03  Alex Christensen  <achristensen@webkit.org>
>+
>+        Make BlendMode an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=188325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No change in behavior.
>+
>+        * css/CSSPrimitiveValueMappings.h:
>+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
>+        (WebCore::CSSPrimitiveValue::operator BlendMode const):
>+        * html/HTMLImageElement.cpp:
>+        (WebCore::HTMLImageElement::parseAttribute):
>+        * html/canvas/CanvasRenderingContext2DBase.cpp:
>+        (WebCore::CanvasRenderingContext2DBase::State::State):
>+        (WebCore::CanvasRenderingContext2DBase::setGlobalCompositeOperation):
>+        (WebCore::CanvasRenderingContext2DBase::drawImageFromRect):
>+        * platform/graphics/BitmapImage.h:
>+        * platform/graphics/GraphicsContext.h:
>+        (WebCore::ImagePaintingOptions::ImagePaintingOptions):
>+        * platform/graphics/GraphicsContextImpl.h:
>+        * platform/graphics/GraphicsLayer.cpp:
>+        (WebCore::GraphicsLayer::dumpProperties const):
>+        * platform/graphics/GraphicsLayer.h:
>+        * platform/graphics/GraphicsTypes.cpp:
>+        (WebCore::parseBlendMode):
>+        (WebCore::parseCompositeAndBlendOperator):
>+        (WebCore::compositeOperatorName):
>+        (WebCore::blendModeName):
>+        (WebCore::operator<<):
>+        * platform/graphics/GraphicsTypes.h:
>+        * platform/graphics/Image.cpp:
>+        (WebCore::Image::drawTiled):
>+        * platform/graphics/Image.h:
>+        * platform/graphics/ImageBuffer.h:
>+        * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
>+        (PlatformCAFilters::setBlendingFiltersOnLayer):
>+        * platform/graphics/cg/GraphicsContextCG.cpp:
>+        (WebCore::selectCGBlendMode):
>+        * platform/graphics/cpu/arm/filters/FEBlendNEON.h:
>+        (WebCore::FEBlend::platformApplyNEON):
>+        * platform/graphics/displaylists/DisplayListItems.h:
>+        * platform/graphics/displaylists/DisplayListRecorder.h:
>+        * platform/graphics/filters/FEBlend.cpp:
>+        (WebCore::FEBlend::externalRepresentation const):
>+        * rendering/RenderBox.cpp:
>+        (WebCore::RenderBox::paintFillLayers):
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::paintIntoRect):
>+        * rendering/RenderLayer.cpp:
>+        (WebCore::RenderLayer::RenderLayer):
>+        (WebCore::RenderLayer::updateBlendMode):
>+        (WebCore::RenderLayer::beginTransparencyLayers):
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::updateBlendMode):
>+        * rendering/style/FillLayer.cpp:
>+        (WebCore::FillLayer::FillLayer):
>+        (WebCore::FillLayer::hasOpaqueImage const):
>+        * rendering/style/FillLayer.h:
>+        (WebCore::FillLayer::initialFillBlendMode):
>+        * rendering/style/RenderStyle.h:
>+        (WebCore::RenderStyle::setBlendMode):
>+        (WebCore::RenderStyle::hasBlendMode const):
>+        (WebCore::RenderStyle::blendMode const):
>+        (WebCore::RenderStyle::initialBlendMode):
>+        * rendering/style/StyleRareNonInheritedData.cpp:
>+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
>+        * rendering/svg/SVGRenderingContext.cpp:
>+        (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
>+        * svg/SVGAnimatedEnumeration.cpp:
>+        (WebCore::enumerationValueForTargetAttribute):
>+        * svg/SVGFEBlendElement.cpp:
>+        (WebCore::SVGFEBlendElement::SVGFEBlendElement):
>+        (WebCore::SVGFEBlendElement::parseAttribute):
>+        * svg/SVGFEBlendElement.h:
>+        (WebCore::SVGPropertyTraits<BlendMode>::highestEnumValue):
>+        (WebCore::SVGPropertyTraits<BlendMode>::toString):
>+        * svg/graphics/SVGImage.cpp:
>+        (WebCore::SVGImage::nativeImageForCurrentFrame):
>+        (WebCore::SVGImage::nativeImage):
>+        (WebCore::SVGImage::drawPatternForContainer):
>+        (WebCore::SVGImage::draw):
>+
> 2018-08-02  Timothy Hatcher  <timothy@apple.com>
> 
>         Text selection color is hard to see in dark mode web views.
>Index: Source/WebCore/css/CSSPrimitiveValueMappings.h
>===================================================================
>--- Source/WebCore/css/CSSPrimitiveValueMappings.h	(revision 234514)
>+++ Source/WebCore/css/CSSPrimitiveValueMappings.h	(working copy)
>@@ -3903,58 +3903,58 @@ template<> inline CSSPrimitiveValue::CSS
> {
>     m_primitiveUnitType = CSS_VALUE_ID;
>     switch (blendMode) {
>-    case BlendModeNormal:
>+    case BlendMode::Normal:
>         m_value.valueID = CSSValueNormal;
>         break;
>-    case BlendModeMultiply:
>+    case BlendMode::Multiply:
>         m_value.valueID = CSSValueMultiply;
>         break;
>-    case BlendModeScreen:
>+    case BlendMode::Screen:
>         m_value.valueID = CSSValueScreen;
>         break;
>-    case BlendModeOverlay:
>+    case BlendMode::Overlay:
>         m_value.valueID = CSSValueOverlay;
>         break;
>-    case BlendModeDarken:
>+    case BlendMode::Darken:
>         m_value.valueID = CSSValueDarken;
>         break;
>-    case BlendModeLighten:
>+    case BlendMode::Lighten:
>         m_value.valueID = CSSValueLighten;
>         break;
>-    case BlendModeColorDodge:
>+    case BlendMode::ColorDodge:
>         m_value.valueID = CSSValueColorDodge;
>         break;
>-    case BlendModeColorBurn:
>+    case BlendMode::ColorBurn:
>         m_value.valueID = CSSValueColorBurn;
>         break;
>-    case BlendModeHardLight:
>+    case BlendMode::HardLight:
>         m_value.valueID = CSSValueHardLight;
>         break;
>-    case BlendModeSoftLight:
>+    case BlendMode::SoftLight:
>         m_value.valueID = CSSValueSoftLight;
>         break;
>-    case BlendModeDifference:
>+    case BlendMode::Difference:
>         m_value.valueID = CSSValueDifference;
>         break;
>-    case BlendModeExclusion:
>+    case BlendMode::Exclusion:
>         m_value.valueID = CSSValueExclusion;
>         break;
>-    case BlendModeHue:
>+    case BlendMode::Hue:
>         m_value.valueID = CSSValueHue;
>         break;
>-    case BlendModeSaturation:
>+    case BlendMode::Saturation:
>         m_value.valueID = CSSValueSaturation;
>         break;
>-    case BlendModeColor:
>+    case BlendMode::Color:
>         m_value.valueID = CSSValueColor;
>         break;
>-    case BlendModeLuminosity:
>+    case BlendMode::Luminosity:
>         m_value.valueID = CSSValueLuminosity;
>         break;
>-    case BlendModePlusDarker:
>+    case BlendMode::PlusDarker:
>         m_value.valueID = CSSValuePlusDarker;
>         break;
>-    case BlendModePlusLighter:
>+    case BlendMode::PlusLighter:
>         m_value.valueID = CSSValuePlusLighter;
>         break;
>     }
>@@ -3966,47 +3966,47 @@ template<> inline CSSPrimitiveValue::ope
> 
>     switch (m_value.valueID) {
>     case CSSValueNormal:
>-        return BlendModeNormal;
>+        return BlendMode::Normal;
>     case CSSValueMultiply:
>-        return BlendModeMultiply;
>+        return BlendMode::Multiply;
>     case CSSValueScreen:
>-        return BlendModeScreen;
>+        return BlendMode::Screen;
>     case CSSValueOverlay:
>-        return BlendModeOverlay;
>+        return BlendMode::Overlay;
>     case CSSValueDarken:
>-        return BlendModeDarken;
>+        return BlendMode::Darken;
>     case CSSValueLighten:
>-        return BlendModeLighten;
>+        return BlendMode::Lighten;
>     case CSSValueColorDodge:
>-        return BlendModeColorDodge;
>+        return BlendMode::ColorDodge;
>     case CSSValueColorBurn:
>-        return BlendModeColorBurn;
>+        return BlendMode::ColorBurn;
>     case CSSValueHardLight:
>-        return BlendModeHardLight;
>+        return BlendMode::HardLight;
>     case CSSValueSoftLight:
>-        return BlendModeSoftLight;
>+        return BlendMode::SoftLight;
>     case CSSValueDifference:
>-        return BlendModeDifference;
>+        return BlendMode::Difference;
>     case CSSValueExclusion:
>-        return BlendModeExclusion;
>+        return BlendMode::Exclusion;
>     case CSSValueHue:
>-        return BlendModeHue;
>+        return BlendMode::Hue;
>     case CSSValueSaturation:
>-        return BlendModeSaturation;
>+        return BlendMode::Saturation;
>     case CSSValueColor:
>-        return BlendModeColor;
>+        return BlendMode::Color;
>     case CSSValueLuminosity:
>-        return BlendModeLuminosity;
>+        return BlendMode::Luminosity;
>     case CSSValuePlusDarker:
>-        return BlendModePlusDarker;
>+        return BlendMode::PlusDarker;
>     case CSSValuePlusLighter:
>-        return BlendModePlusLighter;
>+        return BlendMode::PlusLighter;
>     default:
>         break;
>     }
> 
>     ASSERT_NOT_REACHED();
>-    return BlendModeNormal;
>+    return BlendMode::Normal;
> }
> 
> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Isolation isolation)
>Index: Source/WebCore/html/HTMLImageElement.cpp
>===================================================================
>--- Source/WebCore/html/HTMLImageElement.cpp	(revision 234514)
>+++ Source/WebCore/html/HTMLImageElement.cpp	(working copy)
>@@ -221,7 +221,7 @@ void HTMLImageElement::parseAttribute(co
>             treeScope().addImageElementByUsemap(*m_parsedUsemap.impl(), *this);
>     } else if (name == compositeAttr) {
>         // FIXME: images don't support blend modes in their compositing attribute.
>-        BlendMode blendOp = BlendModeNormal;
>+        BlendMode blendOp = BlendMode::Normal;
>         if (!parseCompositeAndBlendOperator(value, m_compositeOperator, blendOp))
>             m_compositeOperator = CompositeSourceOver;
> #if ENABLE(SERVICE_CONTROLS)
>Index: Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp
>===================================================================
>--- Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp	(revision 234514)
>+++ Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp	(working copy)
>@@ -199,7 +199,7 @@ CanvasRenderingContext2DBase::State::Sta
>     , shadowColor(Color::transparent)
>     , globalAlpha(1)
>     , globalComposite(CompositeSourceOver)
>-    , globalBlend(BlendModeNormal)
>+    , globalBlend(BlendMode::Normal)
>     , hasInvertibleTransform(true)
>     , lineDashOffset(0)
>     , imageSmoothingEnabled(true)
>@@ -774,7 +774,7 @@ String CanvasRenderingContext2DBase::glo
> void CanvasRenderingContext2DBase::setGlobalCompositeOperation(const String& operation)
> {
>     CompositeOperator op = CompositeSourceOver;
>-    BlendMode blendMode = BlendModeNormal;
>+    BlendMode blendMode = BlendMode::Normal;
>     if (!parseCompositeAndBlendOperator(operation, op, blendMode))
>         return;
>     if ((state().globalComposite == op) && (state().globalBlend == blendMode))
>@@ -1714,10 +1714,10 @@ ExceptionOr<void> CanvasRenderingContext
> void CanvasRenderingContext2DBase::drawImageFromRect(HTMLImageElement& imageElement, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh, const String& compositeOperation)
> {
>     CompositeOperator op;
>-    auto blendOp = BlendModeNormal;
>-    if (!parseCompositeAndBlendOperator(compositeOperation, op, blendOp) || blendOp != BlendModeNormal)
>+    auto blendOp = BlendMode::Normal;
>+    if (!parseCompositeAndBlendOperator(compositeOperation, op, blendOp) || blendOp != BlendMode::Normal)
>         op = CompositeSourceOver;
>-    drawImage(imageElement, FloatRect { sx, sy, sw, sh }, FloatRect { dx, dy, dw, dh }, op, BlendModeNormal);
>+    drawImage(imageElement, FloatRect { sx, sy, sw, sh }, FloatRect { dx, dy, dw, dh }, op, BlendMode::Normal);
> }
> 
> void CanvasRenderingContext2DBase::clearCanvas()
>Index: Source/WebCore/platform/graphics/BitmapImage.h
>===================================================================
>--- Source/WebCore/platform/graphics/BitmapImage.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/BitmapImage.h	(working copy)
>@@ -162,7 +162,7 @@ protected:
>     void destroyDecodedDataIfNecessary(bool destroyAll = true);
> 
>     ImageDrawResult draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, DecodingMode, ImageOrientationDescription) override;
>-    void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal) override;
>+    void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal) override;
> #if PLATFORM(WIN)
>     void drawFrameMatchingSourceSize(GraphicsContext&, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator) override;
> #endif
>Index: Source/WebCore/platform/graphics/GraphicsContext.h
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsContext.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsContext.h	(working copy)
>@@ -184,7 +184,7 @@ struct GraphicsContextState {
> 
>     float alpha { 1 };
>     CompositeOperator compositeOperator { CompositeSourceOver };
>-    BlendMode blendMode { BlendModeNormal };
>+    BlendMode blendMode { BlendMode::Normal };
>     InterpolationQuality imageInterpolationQuality { InterpolationDefault };
> 
>     bool shouldAntialias : 1;
>@@ -198,7 +198,7 @@ struct GraphicsContextState {
> };
> 
> struct ImagePaintingOptions {
>-    ImagePaintingOptions(CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal, DecodingMode decodingMode = DecodingMode::Synchronous, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), InterpolationQuality interpolationQuality = InterpolationDefault)
>+    ImagePaintingOptions(CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendMode::Normal, DecodingMode decodingMode = DecodingMode::Synchronous, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), InterpolationQuality interpolationQuality = InterpolationDefault)
>         : m_compositeOperator(compositeOperator)
>         , m_blendMode(blendMode)
>         , m_decodingMode(decodingMode)
>@@ -207,7 +207,7 @@ struct ImagePaintingOptions {
>     {
>     }
> 
>-    ImagePaintingOptions(ImageOrientationDescription orientationDescription, InterpolationQuality interpolationQuality = InterpolationDefault, CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal, DecodingMode decodingMode = DecodingMode::Synchronous)
>+    ImagePaintingOptions(ImageOrientationDescription orientationDescription, InterpolationQuality interpolationQuality = InterpolationDefault, CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendMode::Normal, DecodingMode decodingMode = DecodingMode::Synchronous)
>         : m_compositeOperator(compositeOperator)
>         , m_blendMode(blendMode)
>         , m_decodingMode(decodingMode)
>@@ -216,7 +216,7 @@ struct ImagePaintingOptions {
>     {
>     }
> 
>-    ImagePaintingOptions(InterpolationQuality interpolationQuality, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal, DecodingMode decodingMode = DecodingMode::Synchronous)
>+    ImagePaintingOptions(InterpolationQuality interpolationQuality, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendMode::Normal, DecodingMode decodingMode = DecodingMode::Synchronous)
>         : m_compositeOperator(compositeOperator)
>         , m_blendMode(blendMode)
>         , m_decodingMode(decodingMode)
>@@ -326,7 +326,7 @@ public:
>     const GraphicsContextState& state() const { return m_state; }
> 
> #if USE(CG) || USE(DIRECT2D) || USE(CAIRO)
>-    WEBCORE_EXPORT void drawNativeImage(const NativeImagePtr&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = ImageOrientation());
>+    WEBCORE_EXPORT void drawNativeImage(const NativeImagePtr&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendMode::Normal, ImageOrientation = ImageOrientation());
> #endif
> 
> #if USE(CG) || USE(DIRECT2D)
>@@ -364,8 +364,8 @@ public:
>     WEBCORE_EXPORT void fillRect(const FloatRect&);
>     WEBCORE_EXPORT void fillRect(const FloatRect&, const Color&);
>     void fillRect(const FloatRect&, Gradient&);
>-    void fillRect(const FloatRect&, const Color&, CompositeOperator, BlendMode = BlendModeNormal);
>-    void fillRoundedRect(const FloatRoundedRect&, const Color&, BlendMode = BlendModeNormal);
>+    void fillRect(const FloatRect&, const Color&, CompositeOperator, BlendMode = BlendMode::Normal);
>+    void fillRoundedRect(const FloatRoundedRect&, const Color&, BlendMode = BlendMode::Normal);
>     void fillRectWithRoundedHole(const FloatRect&, const FloatRoundedRect& roundedHoleRect, const Color&);
> 
>     WEBCORE_EXPORT void clearRect(const FloatRect&);
>@@ -384,7 +384,7 @@ public:
>     void drawImageBuffer(ImageBuffer&, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
>     void drawImageBuffer(ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
> 
>-    void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal);
>+    void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal);
> 
>     WEBCORE_EXPORT void drawConsumingImageBuffer(std::unique_ptr<ImageBuffer>, const FloatPoint& destination, const ImagePaintingOptions& = ImagePaintingOptions());
>     void drawConsumingImageBuffer(std::unique_ptr<ImageBuffer>, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
>@@ -456,7 +456,7 @@ public:
>     void setAlpha(float);
>     float alpha() const { return m_state.alpha; }
> 
>-    WEBCORE_EXPORT void setCompositeOperation(CompositeOperator, BlendMode = BlendModeNormal);
>+    WEBCORE_EXPORT void setCompositeOperation(CompositeOperator, BlendMode = BlendMode::Normal);
>     CompositeOperator compositeOperation() const { return m_state.compositeOperator; }
>     BlendMode blendModeOperation() const { return m_state.blendMode; }
> 
>@@ -614,7 +614,7 @@ private:
>     void clearPlatformShadow();
> 
>     void setPlatformAlpha(float);
>-    void setPlatformCompositeOperation(CompositeOperator, BlendMode = BlendModeNormal);
>+    void setPlatformCompositeOperation(CompositeOperator, BlendMode = BlendMode::Normal);
> 
>     void beginPlatformTransparencyLayer(float opacity);
>     void endPlatformTransparencyLayer();
>Index: Source/WebCore/platform/graphics/GraphicsContextImpl.h
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsContextImpl.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsContextImpl.h	(working copy)
>@@ -74,7 +74,7 @@ public:
> #if USE(CG) || USE(CAIRO)
>     virtual void drawNativeImage(const NativeImagePtr&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientation) = 0;
> #endif
>-    virtual void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal) = 0;
>+    virtual void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal) = 0;
> 
>     virtual void drawRect(const FloatRect&, float borderThickness) = 0;
>     virtual void drawLine(const FloatPoint&, const FloatPoint&) = 0;
>Index: Source/WebCore/platform/graphics/GraphicsLayer.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsLayer.cpp	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsLayer.cpp	(working copy)
>@@ -761,7 +761,7 @@ void GraphicsLayer::dumpProperties(TextS
>         ts << indent << "(opacity " << m_opacity << ")\n";
> 
> #if ENABLE(CSS_COMPOSITING)
>-    if (m_blendMode != BlendModeNormal)
>+    if (m_blendMode != BlendMode::Normal)
>         ts << indent << "(blendMode " << compositeOperatorName(CompositeSourceOver, m_blendMode) << ")\n";
> #endif
> 
>Index: Source/WebCore/platform/graphics/GraphicsLayer.h
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsLayer.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsLayer.h	(working copy)
>@@ -648,7 +648,7 @@ protected:
>     FilterOperations m_backdropFilters;
> 
> #if ENABLE(CSS_COMPOSITING)
>-    BlendMode m_blendMode { BlendModeNormal };
>+    BlendMode m_blendMode { BlendMode::Normal };
> #endif
> 
>     const Type m_type;
>Index: Source/WebCore/platform/graphics/GraphicsTypes.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsTypes.cpp	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsTypes.cpp	(working copy)
>@@ -72,13 +72,13 @@ static const char* const blendOperatorNa
>     "plus-lighter"
> };
> const int numCompositeOperatorNames = WTF_ARRAY_LENGTH(compositeOperatorNames);
>-const int numBlendOperatorNames = WTF_ARRAY_LENGTH(blendOperatorNames);
>+const unsigned numBlendOperatorNames = WTF_ARRAY_LENGTH(blendOperatorNames);
> 
> bool parseBlendMode(const String& s, BlendMode& blendMode)
> {
>-    for (int i = 0; i < numBlendOperatorNames; i++) {
>+    for (unsigned i = 0; i < numBlendOperatorNames; i++) {
>         if (s == blendOperatorNames[i]) {
>-            blendMode = static_cast<BlendMode>(i + BlendModeNormal);
>+            blendMode = static_cast<BlendMode>(i + static_cast<unsigned>(BlendMode::Normal));
>             return true;
>         }
>     }
>@@ -91,7 +91,7 @@ bool parseCompositeAndBlendOperator(cons
>     for (int i = 0; i < numCompositeOperatorNames; i++) {
>         if (s == compositeOperatorNames[i]) {
>             op = static_cast<CompositeOperator>(i);
>-            blendOp = BlendModeNormal;
>+            blendOp = BlendMode::Normal;
>             return true;
>         }
>     }
>@@ -111,23 +111,23 @@ String compositeOperatorName(CompositeOp
> {
>     ASSERT(op >= 0);
>     ASSERT(op < numCompositeOperatorNames);
>-    ASSERT(blendOp >= BlendModeNormal);
>-    ASSERT(blendOp <= numBlendOperatorNames);
>-    if (blendOp > BlendModeNormal)
>-        return blendOperatorNames[blendOp - BlendModeNormal];
>+    ASSERT(blendOp >= BlendMode::Normal);
>+    ASSERT(static_cast<unsigned>(blendOp) <= numBlendOperatorNames);
>+    if (blendOp > BlendMode::Normal)
>+        return blendOperatorNames[static_cast<unsigned>(blendOp) - static_cast<unsigned>(BlendMode::Normal)];
>     return compositeOperatorNames[op];
> }
> 
> String blendModeName(BlendMode blendOp)
> {
>-    ASSERT(blendOp >= BlendModeNormal);
>-    ASSERT(blendOp <= BlendModePlusLighter);
>-    return blendOperatorNames[blendOp - BlendModeNormal];
>+    ASSERT(blendOp >= BlendMode::Normal);
>+    ASSERT(blendOp <= BlendMode::PlusLighter);
>+    return blendOperatorNames[static_cast<unsigned>(blendOp) - static_cast<unsigned>(BlendMode::Normal)];
> }
> 
> TextStream& operator<<(TextStream& ts, CompositeOperator op)
> {
>-    return ts << compositeOperatorName(op, BlendModeNormal);
>+    return ts << compositeOperatorName(op, BlendMode::Normal);
> }
> 
> TextStream& operator<<(TextStream& ts, BlendMode blendMode)
>Index: Source/WebCore/platform/graphics/GraphicsTypes.h
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsTypes.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/GraphicsTypes.h	(working copy)
>@@ -51,25 +51,25 @@ enum CompositeOperator {
>     CompositeDifference
> };
> 
>-enum BlendMode {
>-    BlendModeNormal = 1, // Start with 1 to match SVG's blendmode enumeration.
>-    BlendModeMultiply,
>-    BlendModeScreen,
>-    BlendModeDarken,
>-    BlendModeLighten,
>-    BlendModeOverlay,
>-    BlendModeColorDodge,
>-    BlendModeColorBurn,
>-    BlendModeHardLight,
>-    BlendModeSoftLight,
>-    BlendModeDifference,
>-    BlendModeExclusion,
>-    BlendModeHue,
>-    BlendModeSaturation,
>-    BlendModeColor,
>-    BlendModeLuminosity,
>-    BlendModePlusDarker,
>-    BlendModePlusLighter
>+enum class BlendMode {
>+    Normal = 1, // Start with 1 to match SVG's blendmode enumeration.
>+    Multiply,
>+    Screen,
>+    Darken,
>+    Lighten,
>+    Overlay,
>+    ColorDodge,
>+    ColorBurn,
>+    HardLight,
>+    SoftLight,
>+    Difference,
>+    Exclusion,
>+    Hue,
>+    Saturation,
>+    Color,
>+    Luminosity,
>+    PlusDarker,
>+    PlusLighter
> };
> 
> enum GradientSpreadMethod {
>Index: Source/WebCore/platform/graphics/Image.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/Image.cpp	(revision 234514)
>+++ Source/WebCore/platform/graphics/Image.cpp	(working copy)
>@@ -196,7 +196,7 @@ ImageDrawResult Image::drawTiled(Graphic
>             visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
>             visibleSrcRect.setWidth(1);
>             visibleSrcRect.setHeight(destRect.height() / scale.height());
>-            return draw(ctxt, destRect, visibleSrcRect, op, BlendModeNormal, decodingMode, ImageOrientationDescription());
>+            return draw(ctxt, destRect, visibleSrcRect, op, BlendMode::Normal, decodingMode, ImageOrientationDescription());
>         }
>         if (size().height() == 1 && intersection(oneTileRect, destRect).width() == destRect.width()) {
>             FloatRect visibleSrcRect;
>@@ -204,7 +204,7 @@ ImageDrawResult Image::drawTiled(Graphic
>             visibleSrcRect.setY(0);
>             visibleSrcRect.setWidth(destRect.width() / scale.width());
>             visibleSrcRect.setHeight(1);
>-            return draw(ctxt, destRect, visibleSrcRect, op, BlendModeNormal, decodingMode, ImageOrientationDescription());
>+            return draw(ctxt, destRect, visibleSrcRect, op, BlendMode::Normal, decodingMode, ImageOrientationDescription());
>         }
>     }
> #endif
>@@ -236,7 +236,7 @@ ImageDrawResult Image::drawTiled(Graphic
>                 FloatRect fromRect(toFloatPoint(currentTileRect.location() - oneTileRect.location()), currentTileRect.size());
>                 fromRect.scale(1 / scale.width(), 1 / scale.height());
> 
>-                result = draw(ctxt, toRect, fromRect, op, BlendModeNormal, decodingMode, ImageOrientationDescription());
>+                result = draw(ctxt, toRect, fromRect, op, BlendMode::Normal, decodingMode, ImageOrientationDescription());
>                 if (result == ImageDrawResult::DidRequestDecoding)
>                     return result;
>                 toX += currentTileRect.width();
>Index: Source/WebCore/platform/graphics/Image.h
>===================================================================
>--- Source/WebCore/platform/graphics/Image.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/Image.h	(working copy)
>@@ -174,7 +174,7 @@ public:
> #endif
> 
>     virtual void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform,
>-        const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal);
>+        const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal);
> 
> #if !ASSERT_DISABLED
>     virtual bool notSolidColor() { return true; }
>Index: Source/WebCore/platform/graphics/ImageBuffer.h
>===================================================================
>--- Source/WebCore/platform/graphics/ImageBuffer.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/ImageBuffer.h	(working copy)
>@@ -144,10 +144,10 @@ private:
>     void flushContext() const;
> #endif
>     
>-    void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal);
>-    void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal);
>+    void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendMode::Normal);
>+    void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal);
> 
>-    static void drawConsuming(std::unique_ptr<ImageBuffer>, GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal);
>+    static void drawConsuming(std::unique_ptr<ImageBuffer>, GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendMode::Normal);
> 
>     inline void genericConvertToLuminanceMask();
> 
>Index: Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
>===================================================================
>--- Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm	(revision 234514)
>+++ Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm	(working copy)
>@@ -556,52 +556,52 @@ void PlatformCAFilters::setBlendingFilte
>     CAFilter* filter = nil;
> 
>     switch (blendMode) {
>-    case BlendModeNormal:
>+    case BlendMode::Normal:
>         // No need to set an actual filter object in this case.
>         break;
>-    case BlendModeOverlay:
>+    case BlendMode::Overlay:
>         filter = [CAFilter filterWithType:kCAFilterOverlayBlendMode];
>         break;
>-    case BlendModeColorDodge:
>+    case BlendMode::ColorDodge:
>         filter = [CAFilter filterWithType:kCAFilterColorDodgeBlendMode];
>         break;
>-    case BlendModeColorBurn:
>+    case BlendMode::ColorBurn:
>         filter = [CAFilter filterWithType:kCAFilterColorBurnBlendMode];
>         break;
>-    case BlendModeDarken:
>+    case BlendMode::Darken:
>         filter = [CAFilter filterWithType:kCAFilterDarkenBlendMode];
>         break;
>-    case BlendModeDifference:
>+    case BlendMode::Difference:
>         filter = [CAFilter filterWithType:kCAFilterDifferenceBlendMode];
>         break;
>-    case BlendModeExclusion:
>+    case BlendMode::Exclusion:
>         filter = [CAFilter filterWithType:kCAFilterExclusionBlendMode];
>         break;
>-    case BlendModeHardLight:
>+    case BlendMode::HardLight:
>         filter = [CAFilter filterWithType:kCAFilterHardLightBlendMode];
>         break;
>-    case BlendModeMultiply:
>+    case BlendMode::Multiply:
>         filter = [CAFilter filterWithType:kCAFilterMultiplyBlendMode];
>         break;
>-    case BlendModeLighten:
>+    case BlendMode::Lighten:
>         filter = [CAFilter filterWithType:kCAFilterLightenBlendMode];
>         break;
>-    case BlendModeSoftLight:
>+    case BlendMode::SoftLight:
>         filter = [CAFilter filterWithType:kCAFilterSoftLightBlendMode];
>         break;
>-    case BlendModeScreen:
>+    case BlendMode::Screen:
>         filter = [CAFilter filterWithType:kCAFilterScreenBlendMode];
>         break;
>-    case BlendModePlusDarker:
>+    case BlendMode::PlusDarker:
>         filter = [CAFilter filterWithType:kCAFilterPlusD];
>         break;
>-    case BlendModePlusLighter:
>+    case BlendMode::PlusLighter:
>         filter = [CAFilter filterWithType:kCAFilterPlusL];
>         break;
>-    case BlendModeHue:
>-    case BlendModeSaturation:
>-    case BlendModeColor:
>-    case BlendModeLuminosity:
>+    case BlendMode::Hue:
>+    case BlendMode::Saturation:
>+    case BlendMode::Color:
>+    case BlendMode::Luminosity:
>         // FIXME: CA does't support non-separable blend modes on compositing filters.
>         break;
>     default:
>Index: Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	(revision 234514)
>+++ Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	(working copy)
>@@ -158,7 +158,7 @@ static InterpolationQuality convertInter
> static CGBlendMode selectCGBlendMode(CompositeOperator compositeOperator, BlendMode blendMode)
> {
>     switch (blendMode) {
>-    case BlendModeNormal:
>+    case BlendMode::Normal:
>         switch (compositeOperator) {
>         case CompositeClear:
>             return kCGBlendModeClear;
>@@ -190,39 +190,39 @@ static CGBlendMode selectCGBlendMode(Com
>             return kCGBlendModeDifference;
>         }
>         break;
>-    case BlendModeMultiply:
>+    case BlendMode::Multiply:
>         return kCGBlendModeMultiply;
>-    case BlendModeScreen:
>+    case BlendMode::Screen:
>         return kCGBlendModeScreen;
>-    case BlendModeOverlay:
>+    case BlendMode::Overlay:
>         return kCGBlendModeOverlay;
>-    case BlendModeDarken:
>+    case BlendMode::Darken:
>         return kCGBlendModeDarken;
>-    case BlendModeLighten:
>+    case BlendMode::Lighten:
>         return kCGBlendModeLighten;
>-    case BlendModeColorDodge:
>+    case BlendMode::ColorDodge:
>         return kCGBlendModeColorDodge;
>-    case BlendModeColorBurn:
>+    case BlendMode::ColorBurn:
>         return kCGBlendModeColorBurn;
>-    case BlendModeHardLight:
>+    case BlendMode::HardLight:
>         return kCGBlendModeHardLight;
>-    case BlendModeSoftLight:
>+    case BlendMode::SoftLight:
>         return kCGBlendModeSoftLight;
>-    case BlendModeDifference:
>+    case BlendMode::Difference:
>         return kCGBlendModeDifference;
>-    case BlendModeExclusion:
>+    case BlendMode::Exclusion:
>         return kCGBlendModeExclusion;
>-    case BlendModeHue:
>+    case BlendMode::Hue:
>         return kCGBlendModeHue;
>-    case BlendModeSaturation:
>+    case BlendMode::Saturation:
>         return kCGBlendModeSaturation;
>-    case BlendModeColor:
>+    case BlendMode::Color:
>         return kCGBlendModeColor;
>-    case BlendModeLuminosity:
>+    case BlendMode::Luminosity:
>         return kCGBlendModeLuminosity;
>-    case BlendModePlusDarker:
>+    case BlendMode::PlusDarker:
>         return kCGBlendModePlusDarker;
>-    case BlendModePlusLighter:
>+    case BlendMode::PlusLighter:
>         return kCGBlendModePlusLighter;
>     }
> 
>Index: Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h
>===================================================================
>--- Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h	(working copy)
>@@ -163,19 +163,19 @@ void FEBlend::platformApplyNEON(unsigned
> 
>         uint16x8_t result;
>         switch (m_mode) {
>-        case BlendModeNormal:
>+        case BlendMode::Normal:
>             result = FEBlendUtilitiesNEON::normal(doubblePixelA, doubblePixelB, alphaA, alphaB, sixteenConst255, sixteenConstOne);
>             break;
>-        case BlendModeMultiply:
>+        case BlendMode::Multiply:
>             result = FEBlendUtilitiesNEON::multiply(doubblePixelA, doubblePixelB, alphaA, alphaB, sixteenConst255, sixteenConstOne);
>             break;
>-        case BlendModeScreen:
>+        case BlendMode::Screen:
>             result = FEBlendUtilitiesNEON::screen(doubblePixelA, doubblePixelB, alphaA, alphaB, sixteenConst255, sixteenConstOne);
>             break;
>-        case BlendModeDarken:
>+        case BlendMode::Darken:
>             result = FEBlendUtilitiesNEON::darken(doubblePixelA, doubblePixelB, alphaA, alphaB, sixteenConst255, sixteenConstOne);
>             break;
>-        case BlendModeLighten:
>+        case BlendMode::Lighten:
>             result = FEBlendUtilitiesNEON::lighten(doubblePixelA, doubblePixelB, alphaA, alphaB, sixteenConst255, sixteenConstOne);
>             break;
>         default:
>Index: Source/WebCore/platform/graphics/displaylists/DisplayListItems.h
>===================================================================
>--- Source/WebCore/platform/graphics/displaylists/DisplayListItems.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/displaylists/DisplayListItems.h	(working copy)
>@@ -685,7 +685,7 @@ public:
>     FloatSize spacing() const { return m_spacing; }
> 
> private:
>-    DrawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal);
>+    DrawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal);
> 
>     void apply(GraphicsContext&) const override;
> 
>Index: Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h
>===================================================================
>--- Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h	(revision 234514)
>+++ Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h	(working copy)
>@@ -93,7 +93,7 @@ private:
> #if USE(CG) || USE(CAIRO)
>     void drawNativeImage(const NativeImagePtr&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientation) override;
> #endif
>-    void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal) override;
>+    void drawPattern(Image&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendMode::Normal) override;
> 
>     void drawRect(const FloatRect&, float borderThickness) override;
>     void drawLine(const FloatPoint&, const FloatPoint&) override;
>Index: Source/WebCore/platform/graphics/filters/FEBlend.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/filters/FEBlend.cpp	(revision 234514)
>+++ Source/WebCore/platform/graphics/filters/FEBlend.cpp	(working copy)
>@@ -78,7 +78,7 @@ TextStream& FEBlend::externalRepresentat
> {
>     ts << indent << "[feBlend";
>     FilterEffect::externalRepresentation(ts, representation);
>-    ts << " mode=\"" << (m_mode == BlendModeNormal ? "normal" : compositeOperatorName(CompositeSourceOver, m_mode)) << "\"]\n";
>+    ts << " mode=\"" << (m_mode == BlendMode::Normal ? "normal" : compositeOperatorName(CompositeSourceOver, m_mode)) << "\"]\n";
> 
>     TextStream::IndentScope indentScope(ts);
>     inputEffect(0)->externalRepresentation(ts, representation);
>Index: Source/WebCore/rendering/RenderBox.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderBox.cpp	(revision 234514)
>+++ Source/WebCore/rendering/RenderBox.cpp	(working copy)
>@@ -1581,7 +1581,7 @@ void RenderBox::paintFillLayers(const Pa
>     for (auto* layer = &fillLayer; layer; layer = layer->next()) {
>         layers.append(layer);
> 
>-        if (layer->blendMode() != BlendModeNormal)
>+        if (layer->blendMode() != BlendMode::Normal)
>             shouldDrawBackgroundInSeparateBuffer = true;
> 
>         // Stop traversal when an opaque layer is encountered.
>@@ -1593,7 +1593,7 @@ void RenderBox::paintFillLayers(const Pa
>         // and pass it down.
> 
>         // The clipOccludesNextLayers condition must be evaluated first to avoid short-circuiting.
>-        if (layer->clipOccludesNextLayers(layer == &fillLayer) && layer->hasOpaqueImage(*this) && layer->image()->canRender(this, style().effectiveZoom()) && layer->hasRepeatXY() && layer->blendMode() == BlendModeNormal)
>+        if (layer->clipOccludesNextLayers(layer == &fillLayer) && layer->hasOpaqueImage(*this) && layer->image()->canRender(this, style().effectiveZoom()) && layer->hasRepeatXY() && layer->blendMode() == BlendMode::Normal)
>             break;
>     }
> 
>Index: Source/WebCore/rendering/RenderImage.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderImage.cpp	(revision 234514)
>+++ Source/WebCore/rendering/RenderImage.cpp	(working copy)
>@@ -617,7 +617,7 @@ ImageDrawResult RenderImage::paintIntoRe
> 
>     ImageOrientationDescription orientationDescription(shouldRespectImageOrientation(), style().imageOrientation());
>     auto decodingMode = decodingModeForImageDraw(*image, paintInfo);
>-    auto drawResult = paintInfo.context().drawImage(*img, rect, ImagePaintingOptions(compositeOperator, BlendModeNormal, decodingMode, orientationDescription, interpolation));
>+    auto drawResult = paintInfo.context().drawImage(*img, rect, ImagePaintingOptions(compositeOperator, BlendMode::Normal, decodingMode, orientationDescription, interpolation));
>     if (drawResult == ImageDrawResult::DidRequestDecoding)
>         imageResource().cachedImage()->addClientWaitingForAsyncDecoding(*this);
> 
>Index: Source/WebCore/rendering/RenderLayer.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayer.cpp	(revision 234514)
>+++ Source/WebCore/rendering/RenderLayer.cpp	(working copy)
>@@ -313,7 +313,7 @@ RenderLayer::RenderLayer(RenderLayerMode
> #endif
>     , m_hasFilterInfo(false)
> #if ENABLE(CSS_COMPOSITING)
>-    , m_blendMode(BlendModeNormal)
>+    , m_blendMode(static_cast<unsigned>(BlendMode::Normal))
>     , m_hasNotIsolatedCompositedBlendingDescendants(false)
>     , m_hasNotIsolatedBlendingDescendants(false)
>     , m_hasNotIsolatedBlendingDescendantsStatusDirty(false)
>@@ -926,7 +926,7 @@ void RenderLayer::positionNewlyCreatedOv
> 
> void RenderLayer::updateBlendMode()
> {
>-    bool hadBlendMode = m_blendMode != BlendModeNormal;
>+    bool hadBlendMode = static_cast<BlendMode>(m_blendMode) != BlendMode::Normal;
>     if (parent() && hadBlendMode != hasBlendMode()) {
>         if (hasBlendMode())
>             parent()->updateAncestorChainHasBlendingDescendants();
>@@ -935,8 +935,8 @@ void RenderLayer::updateBlendMode()
>     }
> 
>     BlendMode newBlendMode = renderer().style().blendMode();
>-    if (newBlendMode != m_blendMode)
>-        m_blendMode = newBlendMode;
>+    if (newBlendMode != static_cast<BlendMode>(m_blendMode))
>+        m_blendMode = static_cast<unsigned>(newBlendMode);
> }
> 
> void RenderLayer::updateAncestorChainHasBlendingDescendants()
>@@ -1827,7 +1827,7 @@ void RenderLayer::beginTransparencyLayer
> 
> #if ENABLE(CSS_COMPOSITING)
>         if (usesCompositeOperation)
>-            context.setCompositeOperation(context.compositeOperation(), BlendModeNormal);
>+            context.setCompositeOperation(context.compositeOperation(), BlendMode::Normal);
> #endif
> 
> #ifdef REVEAL_TRANSPARENCY_LAYERS
>Index: Source/WebCore/rendering/RenderLayerBacking.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 234514)
>+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
>@@ -540,7 +540,7 @@ void RenderLayerBacking::updateBlendMode
>     // FIXME: where is the blend mode updated when m_ancestorClippingLayers come and go?
>     if (m_ancestorClippingLayer) {
>         m_ancestorClippingLayer->setBlendMode(style.blendMode());
>-        m_graphicsLayer->setBlendMode(BlendModeNormal);
>+        m_graphicsLayer->setBlendMode(BlendMode::Normal);
>     } else
>         m_graphicsLayer->setBlendMode(style.blendMode());
> }
>Index: Source/WebCore/rendering/style/FillLayer.cpp
>===================================================================
>--- Source/WebCore/rendering/style/FillLayer.cpp	(revision 234514)
>+++ Source/WebCore/rendering/style/FillLayer.cpp	(working copy)
>@@ -54,7 +54,7 @@ FillLayer::FillLayer(FillLayerType type)
>     , m_repeatY(static_cast<unsigned>(FillLayer::initialFillRepeatY(type)))
>     , m_composite(FillLayer::initialFillComposite(type))
>     , m_sizeType(static_cast<unsigned>(FillSizeType::None))
>-    , m_blendMode(FillLayer::initialFillBlendMode(type))
>+    , m_blendMode(static_cast<unsigned>(FillLayer::initialFillBlendMode(type)))
>     , m_maskSourceType(static_cast<unsigned>(FillLayer::initialFillMaskSourceType(type)))
>     , m_imageSet(false)
>     , m_attachmentSet(false)
>@@ -357,7 +357,7 @@ bool FillLayer::hasOpaqueImage(const Ren
>     if (m_composite == CompositeClear || m_composite == CompositeCopy)
>         return true;
> 
>-    return m_blendMode == BlendModeNormal && m_composite == CompositeSourceOver && m_image->knownToBeOpaque(&renderer);
>+    return static_cast<BlendMode>(m_blendMode) == BlendMode::Normal && m_composite == CompositeSourceOver && m_image->knownToBeOpaque(&renderer);
> }
> 
> bool FillLayer::hasRepeatXY() const
>Index: Source/WebCore/rendering/style/FillLayer.h
>===================================================================
>--- Source/WebCore/rendering/style/FillLayer.h	(revision 234514)
>+++ Source/WebCore/rendering/style/FillLayer.h	(working copy)
>@@ -162,7 +162,7 @@ public:
>     static FillRepeat initialFillRepeatX(FillLayerType) { return FillRepeat::Repeat; }
>     static FillRepeat initialFillRepeatY(FillLayerType) { return FillRepeat::Repeat; }
>     static CompositeOperator initialFillComposite(FillLayerType) { return CompositeSourceOver; }
>-    static BlendMode initialFillBlendMode(FillLayerType) { return BlendModeNormal; }
>+    static BlendMode initialFillBlendMode(FillLayerType) { return BlendMode::Normal; }
>     static FillSize initialFillSize(FillLayerType) { return { }; }
>     static Length initialFillXPosition(FillLayerType) { return Length(0.0f, Percent); }
>     static Length initialFillYPosition(FillLayerType) { return Length(0.0f, Percent); }
>Index: Source/WebCore/rendering/style/RenderStyle.h
>===================================================================
>--- Source/WebCore/rendering/style/RenderStyle.h	(revision 234514)
>+++ Source/WebCore/rendering/style/RenderStyle.h	(working copy)
>@@ -766,14 +766,14 @@ public:
> 
> #if ENABLE(CSS_COMPOSITING)
>     BlendMode blendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode); }
>-    void setBlendMode(BlendMode mode) { SET_VAR(m_rareNonInheritedData, effectiveBlendMode, mode); }
>-    bool hasBlendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode) != BlendModeNormal; }
>+    void setBlendMode(BlendMode mode) { SET_VAR(m_rareNonInheritedData, effectiveBlendMode, static_cast<unsigned>(mode)); }
>+    bool hasBlendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode) != BlendMode::Normal; }
> 
>     Isolation isolation() const { return static_cast<Isolation>(m_rareNonInheritedData->isolation); }
>     void setIsolation(Isolation isolation) { SET_VAR(m_rareNonInheritedData, isolation, static_cast<unsigned>(isolation)); }
>     bool hasIsolation() const { return isolation() != Isolation::Auto; }
> #else
>-    BlendMode blendMode() const { return BlendModeNormal; }
>+    BlendMode blendMode() const { return BlendMode::Normal; }
>     bool hasBlendMode() const { return false; }
> 
>     Isolation isolation() const { return Isolation::Auto; }
>@@ -1671,7 +1671,7 @@ public:
> #endif
> 
> #if ENABLE(CSS_COMPOSITING)
>-    static BlendMode initialBlendMode() { return BlendModeNormal; }
>+    static BlendMode initialBlendMode() { return BlendMode::Normal; }
>     static Isolation initialIsolation() { return Isolation::Auto; }
> #endif
> 
>Index: Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
>===================================================================
>--- Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp	(revision 234514)
>+++ Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp	(working copy)
>@@ -91,7 +91,7 @@ StyleRareNonInheritedData::StyleRareNonI
>     , textDecorationStyle(static_cast<unsigned>(RenderStyle::initialTextDecorationStyle()))
>     , aspectRatioType(static_cast<unsigned>(RenderStyle::initialAspectRatioType()))
> #if ENABLE(CSS_COMPOSITING)
>-    , effectiveBlendMode(RenderStyle::initialBlendMode())
>+    , effectiveBlendMode(static_cast<unsigned>(RenderStyle::initialBlendMode()))
>     , isolation(static_cast<unsigned>(RenderStyle::initialIsolation()))
> #endif
> #if ENABLE(APPLE_PAY)
>Index: Source/WebCore/rendering/svg/SVGRenderingContext.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/SVGRenderingContext.cpp	(revision 234514)
>+++ Source/WebCore/rendering/svg/SVGRenderingContext.cpp	(working copy)
>@@ -122,7 +122,7 @@ void SVGRenderingContext::prepareToRende
>             m_paintInfo->context().beginTransparencyLayer(opacity);
> 
>             if (hasBlendMode)
>-                m_paintInfo->context().setCompositeOperation(m_paintInfo->context().compositeOperation(), BlendModeNormal);
>+                m_paintInfo->context().setCompositeOperation(m_paintInfo->context().compositeOperation(), BlendMode::Normal);
> 
>             m_renderingFlags |= EndOpacityLayer;
>         }
>Index: Source/WebCore/svg/SVGAnimatedEnumeration.cpp
>===================================================================
>--- Source/WebCore/svg/SVGAnimatedEnumeration.cpp	(revision 234514)
>+++ Source/WebCore/svg/SVGAnimatedEnumeration.cpp	(working copy)
>@@ -87,9 +87,9 @@ static inline unsigned enumerationValueF
>     }
> 
>     if (attrName == SVGNames::modeAttr) {
>-        BlendMode mode = BlendModeNormal;
>+        BlendMode mode = BlendMode::Normal;
>         parseBlendMode(value, mode);
>-        return mode;
>+        return static_cast<unsigned>(mode);
>     }
>     if (attrName == SVGNames::stitchTilesAttr)
>         return SVGPropertyTraits<SVGStitchOptions>::fromString(value);
>Index: Source/WebCore/svg/SVGFEBlendElement.cpp
>===================================================================
>--- Source/WebCore/svg/SVGFEBlendElement.cpp	(revision 234514)
>+++ Source/WebCore/svg/SVGFEBlendElement.cpp	(working copy)
>@@ -46,7 +46,7 @@ END_REGISTER_ANIMATED_PROPERTIES
> 
> inline SVGFEBlendElement::SVGFEBlendElement(const QualifiedName& tagName, Document& document)
>     : SVGFilterPrimitiveStandardAttributes(tagName, document)
>-    , m_mode(BlendModeNormal)
>+    , m_mode(BlendMode::Normal)
> {
>     ASSERT(hasTagName(SVGNames::feBlendTag));
>     registerAnimatedPropertiesForSVGFEBlendElement();
>@@ -60,7 +60,7 @@ Ref<SVGFEBlendElement> SVGFEBlendElement
> void SVGFEBlendElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     if (name == SVGNames::modeAttr) {
>-        BlendMode mode = BlendModeNormal;
>+        BlendMode mode = BlendMode::Normal;
>         if (parseBlendMode(value, mode))
>             setModeBaseValue(mode);
>         return;
>Index: Source/WebCore/svg/SVGFEBlendElement.h
>===================================================================
>--- Source/WebCore/svg/SVGFEBlendElement.h	(revision 234514)
>+++ Source/WebCore/svg/SVGFEBlendElement.h	(working copy)
>@@ -29,11 +29,11 @@ namespace WebCore {
> 
> template<>
> struct SVGPropertyTraits<BlendMode> {
>-    static unsigned highestEnumValue() { return BlendModeLuminosity; }
>+    static unsigned highestEnumValue() { return static_cast<unsigned>(BlendMode::Luminosity); }
> 
>     static String toString(BlendMode type)
>     {
>-        if (type < BlendModePlusDarker)
>+        if (type < BlendMode::PlusDarker)
>             return blendModeName(type);
> 
>         return emptyString();
>Index: Source/WebCore/svg/graphics/SVGImage.cpp
>===================================================================
>--- Source/WebCore/svg/graphics/SVGImage.cpp	(revision 234514)
>+++ Source/WebCore/svg/graphics/SVGImage.cpp	(working copy)
>@@ -216,7 +216,7 @@ NativeImagePtr SVGImage::nativeImageForC
>     if (!buffer) // failed to allocate image
>         return nullptr;
> 
>-    draw(buffer->context(), rect(), rect(), CompositeSourceOver, BlendModeNormal, DecodingMode::Synchronous, ImageOrientationDescription());
>+    draw(buffer->context(), rect(), rect(), CompositeSourceOver, BlendMode::Normal, DecodingMode::Synchronous, ImageOrientationDescription());
> 
>     // FIXME: WK(Bug 113657): We should use DontCopyBackingStore here.
>     return buffer->copyImage(CopyBackingStore)->nativeImageForCurrentFrame();
>@@ -240,7 +240,7 @@ NativeImagePtr SVGImage::nativeImage(con
> 
>     GraphicsContext localContext(nativeImageTarget.get());
> 
>-    draw(localContext, rect(), rect(), CompositeSourceOver, BlendModeNormal, DecodingMode::Synchronous, ImageOrientationDescription());
>+    draw(localContext, rect(), rect(), CompositeSourceOver, BlendMode::Normal, DecodingMode::Synchronous, ImageOrientationDescription());
> 
>     COMPtr<ID2D1Bitmap> nativeImage;
>     hr = nativeImageTarget->GetBitmap(&nativeImage);
>@@ -268,7 +268,7 @@ void SVGImage::drawPatternForContainer(G
>     std::unique_ptr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(imageBufferSize.size()), 1, ColorSpaceSRGB, context);
>     if (!buffer) // Failed to allocate buffer.
>         return;
>-    drawForContainer(buffer->context(), containerSize, containerZoom, initialFragmentURL, imageBufferSize, zoomedContainerRect, CompositeSourceOver, BlendModeNormal);
>+    drawForContainer(buffer->context(), containerSize, containerZoom, initialFragmentURL, imageBufferSize, zoomedContainerRect, CompositeSourceOver, BlendMode::Normal);
>     if (context.drawLuminanceMask())
>         buffer->convertToLuminanceMask();
> 
>@@ -299,10 +299,10 @@ ImageDrawResult SVGImage::draw(GraphicsC
>     context.clip(enclosingIntRect(dstRect));
> 
>     float alpha = context.alpha();
>-    bool compositingRequiresTransparencyLayer = compositeOp != CompositeSourceOver || blendMode != BlendModeNormal || alpha < 1;
>+    bool compositingRequiresTransparencyLayer = compositeOp != CompositeSourceOver || blendMode != BlendMode::Normal || alpha < 1;
>     if (compositingRequiresTransparencyLayer) {
>         context.beginTransparencyLayer(alpha);
>-        context.setCompositeOperation(CompositeSourceOver, BlendModeNormal);
>+        context.setCompositeOperation(CompositeSourceOver, BlendMode::Normal);
>     }
> 
>     FloatSize scale(dstRect.size() / srcRect.size());
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234568)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-03  Alex Christensen  <achristensen@webkit.org>
>+
>+        Make BlendMode an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=188325
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
>+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
>+
> 2018-08-03  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix spelling of "overridden"
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm	(revision 234514)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm	(working copy)
>@@ -93,7 +93,7 @@ RemoteLayerTreeTransaction::LayerPropert
>     , customAppearance(GraphicsLayer::CustomAppearance::None)
>     , minificationFilter(PlatformCALayer::FilterType::Linear)
>     , magnificationFilter(PlatformCALayer::FilterType::Linear)
>-    , blendMode(BlendModeNormal)
>+    , blendMode(BlendMode::Normal)
>     , windRule(WindRule::NonZero)
>     , hidden(false)
>     , backingStoreAttached(true)

Actions: View | Formatted Diff | Diff

Attachments on bug 188325: 346571 | 346574