Attachment 348818 Details for Bug 189260 – patch

[patch] patch

remove-svg-applytodefault.patch (text/plain), 14.91 KB, created by Antti Koivisto on 2018-09-04 09:35:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-09-04 09:35:43 PDT

Size: 14.91 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 235612)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,40 @@
>+2018-09-04  Antti Koivisto  <antti@apple.com>
>+
>+        Remove pointless RenderSVGResourceMode::ApplyToDefault enum value
>+        https://bugs.webkit.org/show_bug.cgi?id=189260
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Default does not need a bit, it is better represented with an empty OptionSet.
>+
>+        * rendering/svg/RenderSVGResource.cpp:
>+        (WebCore::requestPaintingResource):
>+        * rendering/svg/RenderSVGResource.h:
>+        * rendering/svg/RenderSVGResourceClipper.cpp:
>+        (WebCore::RenderSVGResourceClipper::applyResource):
>+        * rendering/svg/RenderSVGResourceFilter.cpp:
>+        (WebCore::RenderSVGResourceFilter::applyResource):
>+        (WebCore::RenderSVGResourceFilter::postApplyResource):
>+        * rendering/svg/RenderSVGResourceGradient.cpp:
>+        (WebCore::RenderSVGResourceGradient::applyResource):
>+        * rendering/svg/RenderSVGResourceMasker.cpp:
>+        (WebCore::RenderSVGResourceMasker::applyResource):
>+        * rendering/svg/RenderSVGResourcePattern.cpp:
>+        (WebCore::RenderSVGResourcePattern::applyResource):
>+        (WebCore::RenderSVGResourcePattern::postApplyResource):
>+        * rendering/svg/RenderSVGResourceSolidColor.cpp:
>+        (WebCore::RenderSVGResourceSolidColor::applyResource):
>+        (WebCore::RenderSVGResourceSolidColor::postApplyResource):
>+        * rendering/svg/SVGInlineTextBox.cpp:
>+        (WebCore::SVGInlineTextBox::SVGInlineTextBox):
>+        (WebCore::SVGInlineTextBox::paintSelectionBackground):
>+        (WebCore::SVGInlineTextBox::paint):
>+        (WebCore::SVGInlineTextBox::acquirePaintingResource):
>+        (WebCore::SVGInlineTextBox::paintDecorationWithStyle):
>+        * rendering/svg/SVGRenderingContext.cpp:
>+        (WebCore::SVGRenderingContext::~SVGRenderingContext):
>+        (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
>+
> 2018-09-04  Zan Dobersek  <zdobersek@igalia.com> and Ms2ger  <Ms2ger@igalia.com>
> 
>         Implement support for passing ImageBitmap to texImage2D/texSubImage2D
>Index: Source/WebCore/rendering/svg/RenderSVGResource.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResource.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResource.cpp	(working copy)
>@@ -47,7 +47,7 @@ static inline bool inheritColorFromParen
>     return true;
> }
> 
>-static inline RenderSVGResource* requestPaintingResource(OptionSet<RenderSVGResourceMode> mode, RenderElement& renderer, const RenderStyle& style, Color& fallbackColor)
>+static inline RenderSVGResource* requestPaintingResource(RenderSVGResourceMode mode, RenderElement& renderer, const RenderStyle& style, Color& fallbackColor)
> {
>     const SVGRenderStyle& svgStyle = style.svgStyle();
> 
>Index: Source/WebCore/rendering/svg/RenderSVGResource.h
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResource.h	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResource.h	(working copy)
>@@ -38,10 +38,9 @@ enum RenderSVGResourceType {
> 
> // If this enum changes change the unsigned bitfields using it.
> enum class RenderSVGResourceMode {
>-    ApplyToDefault = 1 << 0, // used for all resources except gradient/pattern
>-    ApplyToFill    = 1 << 1,
>-    ApplyToStroke  = 1 << 2,
>-    ApplyToText    = 1 << 3 // used in combination with ApplyTo{Fill|Stroke}Mode
>+    ApplyToFill    = 1 << 0,
>+    ApplyToStroke  = 1 << 1,
>+    ApplyToText    = 1 << 2 // used in combination with ApplyTo{Fill|Stroke}Mode
> };
> 
> class Color;
>Index: Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(working copy)
>@@ -68,7 +68,7 @@ void RenderSVGResourceClipper::removeCli
> bool RenderSVGResourceClipper::applyResource(RenderElement& renderer, const RenderStyle&, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT_UNUSED(resourceMode, resourceMode == RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT_UNUSED(resourceMode, !resourceMode);
> 
>     return applyClippingToContext(renderer, renderer.objectBoundingBox(), renderer.repaintRectInLocalCoordinates(), *context);
> }
>Index: Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp	(working copy)
>@@ -111,7 +111,7 @@ std::unique_ptr<SVGFilterBuilder> Render
> bool RenderSVGResourceFilter::applyResource(RenderElement& renderer, const RenderStyle&, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT_UNUSED(resourceMode, resourceMode == RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT_UNUSED(resourceMode, !resourceMode);
> 
>     LOG(Filters, "RenderSVGResourceFilter %p applyResource renderer %p", this, &renderer);
> 
>@@ -229,7 +229,7 @@ bool RenderSVGResourceFilter::applyResou
> void RenderSVGResourceFilter::postApplyResource(RenderElement& renderer, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode, const Path*, const RenderSVGShape*)
> {
>     ASSERT(context);
>-    ASSERT_UNUSED(resourceMode, resourceMode == RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT_UNUSED(resourceMode, !resourceMode);
> 
>     auto findResult = m_rendererFilterDataMap.find(&renderer);
>     if (findResult == m_rendererFilterDataMap.end())
>Index: Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(working copy)
>@@ -97,7 +97,7 @@ static inline AffineTransform clipToText
> bool RenderSVGResourceGradient::applyResource(RenderElement& renderer, const RenderStyle& style, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     // Be sure to synchronize all SVG properties on the gradientElement _before_ processing any further.
>     // Otherwhise the call to collectGradientAttributes() in createTileImage(), may cause the SVG DOM property
>@@ -190,7 +190,7 @@ bool RenderSVGResourceGradient::applyRes
> void RenderSVGResourceGradient::postApplyResource(RenderElement& renderer, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode, const Path* path, const RenderSVGShape* shape)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     if (resourceMode.contains(RenderSVGResourceMode::ApplyToText)) {
> #if USE(CG)
>Index: Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(working copy)
>@@ -57,7 +57,7 @@ void RenderSVGResourceMasker::removeClie
> bool RenderSVGResourceMasker::applyResource(RenderElement& renderer, const RenderStyle&, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT_UNUSED(resourceMode, resourceMode == RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT_UNUSED(resourceMode, !resourceMode);
> 
>     bool missingMaskerData = !m_masker.contains(&renderer);
>     if (missingMaskerData)
>Index: Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp	(working copy)
>@@ -146,7 +146,7 @@ PatternData* RenderSVGResourcePattern::b
> bool RenderSVGResourcePattern::applyResource(RenderElement& renderer, const RenderStyle& style, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     if (m_shouldCollectPatternAttributes) {
>         patternElement().synchronizeAnimatedSVGAttribute(anyQName());
>@@ -205,7 +205,7 @@ bool RenderSVGResourcePattern::applyReso
> void RenderSVGResourcePattern::postApplyResource(RenderElement&, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode, const Path* path, const RenderSVGShape* shape)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     if (resourceMode.contains(RenderSVGResourceMode::ApplyToFill)) {
>         if (path)
>Index: Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp	(working copy)
>@@ -35,7 +35,7 @@ RenderSVGResourceSolidColor::~RenderSVGR
> bool RenderSVGResourceSolidColor::applyResource(RenderElement& renderer, const RenderStyle& style, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     const SVGRenderStyle& svgStyle = style.svgStyle();
> 
>@@ -70,7 +70,7 @@ bool RenderSVGResourceSolidColor::applyR
> void RenderSVGResourceSolidColor::postApplyResource(RenderElement&, GraphicsContext*& context, OptionSet<RenderSVGResourceMode> resourceMode, const Path* path, const RenderSVGShape* shape)
> {
>     ASSERT(context);
>-    ASSERT(resourceMode != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!resourceMode.isEmpty());
> 
>     if (resourceMode.contains(RenderSVGResourceMode::ApplyToFill)) {
>         if (path)
>Index: Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/SVGInlineTextBox.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/SVGInlineTextBox.cpp	(working copy)
>@@ -53,7 +53,7 @@ COMPILE_ASSERT(sizeof(SVGInlineTextBox) 
> 
> SVGInlineTextBox::SVGInlineTextBox(RenderSVGInlineText& renderer)
>     : InlineTextBox(renderer)
>-    , m_paintingResourceMode(OptionSet<RenderSVGResourceMode>(RenderSVGResourceMode::ApplyToDefault).toRaw())
>+    , m_paintingResourceMode(OptionSet<RenderSVGResourceMode>().toRaw())
>     , m_startsNewTextChunk(false)
> {
> }
>@@ -227,7 +227,7 @@ void SVGInlineTextBox::paintSelectionBac
>         paintInfo.context().setFillColor(backgroundColor);
>         paintInfo.context().fillRect(selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, style), backgroundColor);
> 
>-        setPaintingResourceMode(RenderSVGResourceMode::ApplyToDefault);
>+        setPaintingResourceMode({ });
>     }
> 
>     ASSERT(!m_paintingResource);
>@@ -326,7 +326,7 @@ void SVGInlineTextBox::paint(PaintInfo& 
>         if (decorations & TextDecoration::LineThrough)
>             paintDecoration(paintInfo.context(), TextDecoration::LineThrough, fragment);
> 
>-        setPaintingResourceMode(RenderSVGResourceMode::ApplyToDefault);
>+        setPaintingResourceMode({ });
>     }
> 
>     // Finally, paint the outline if any.
>@@ -339,7 +339,7 @@ void SVGInlineTextBox::paint(PaintInfo& 
> bool SVGInlineTextBox::acquirePaintingResource(GraphicsContext*& context, float scalingFactor, RenderBoxModelObject& renderer, const RenderStyle& style)
> {
>     ASSERT(scalingFactor);
>-    ASSERT(paintingResourceMode() != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!paintingResourceMode().isEmpty());
> 
>     Color fallbackColor;
>     if (paintingResourceMode().contains(RenderSVGResourceMode::ApplyToFill))
>@@ -502,7 +502,7 @@ void SVGInlineTextBox::paintDecoration(G
> void SVGInlineTextBox::paintDecorationWithStyle(GraphicsContext& context, OptionSet<TextDecoration> decoration, const SVGTextFragment& fragment, RenderBoxModelObject& decorationRenderer)
> {
>     ASSERT(!m_paintingResource);
>-    ASSERT(paintingResourceMode() != RenderSVGResourceMode::ApplyToDefault);
>+    ASSERT(!paintingResourceMode().isEmpty());
> 
>     auto& decorationStyle = decorationRenderer.style();
> 
>Index: Source/WebCore/rendering/svg/SVGRenderingContext.cpp
>===================================================================
>--- Source/WebCore/rendering/svg/SVGRenderingContext.cpp	(revision 235604)
>+++ Source/WebCore/rendering/svg/SVGRenderingContext.cpp	(working copy)
>@@ -57,7 +57,7 @@ SVGRenderingContext::~SVGRenderingContex
>     if (m_renderingFlags & EndFilterLayer) {
>         ASSERT(m_filter);
>         GraphicsContext* contextPtr = &m_paintInfo->context();
>-        m_filter->postApplyResource(*m_renderer, contextPtr, RenderSVGResourceMode::ApplyToDefault, nullptr, nullptr);
>+        m_filter->postApplyResource(*m_renderer, contextPtr, { }, nullptr, nullptr);
>         m_paintInfo->setContext(*m_savedContext);
>         m_paintInfo->rect = m_savedPaintRect;
>     }
>@@ -151,7 +151,7 @@ void SVGRenderingContext::prepareToRende
>     if (!isRenderingMask) {
>         if (RenderSVGResourceMasker* masker = resources->masker()) {
>             GraphicsContext* contextPtr = &m_paintInfo->context();
>-            bool result = masker->applyResource(*m_renderer, style, contextPtr, RenderSVGResourceMode::ApplyToDefault);
>+            bool result = masker->applyResource(*m_renderer, style, contextPtr, { });
>             m_paintInfo->setContext(*contextPtr);
>             if (!result)
>                 return;
>@@ -161,7 +161,7 @@ void SVGRenderingContext::prepareToRende
>     RenderSVGResourceClipper* clipper = resources->clipper();
>     if (!hasCSSClipping && clipper) {
>         GraphicsContext* contextPtr = &m_paintInfo->context();
>-        bool result = clipper->applyResource(*m_renderer, style, contextPtr, RenderSVGResourceMode::ApplyToDefault);
>+        bool result = clipper->applyResource(*m_renderer, style, contextPtr, { });
>         m_paintInfo->setContext(*contextPtr);
>         if (!result)
>             return;
>@@ -176,7 +176,7 @@ void SVGRenderingContext::prepareToRende
>             // (because it was either drawn before or empty) but we still need to apply the filter.
>             m_renderingFlags |= EndFilterLayer;
>             GraphicsContext* contextPtr = &m_paintInfo->context();
>-            bool result = m_filter->applyResource(*m_renderer, style, contextPtr, RenderSVGResourceMode::ApplyToDefault);
>+            bool result = m_filter->applyResource(*m_renderer, style, contextPtr, { });
>             m_paintInfo->setContext(*contextPtr);
>             if (!result)
>                 return;

Actions: View | Formatted Diff | Diff

Attachments on bug 189260: 348818