Diff
Modified: trunk/Source/WebCore/ChangeLog (235656 => 235657)
--- trunk/Source/WebCore/ChangeLog 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/ChangeLog 2018-09-05 04:32:59 UTC (rev 235657)
@@ -1,3 +1,40 @@
+2018-09-04 Antti Koivisto <an...@apple.com>
+
+ Remove pointless RenderSVGResourceMode::ApplyToDefault enum value
+ https://bugs.webkit.org/show_bug.cgi?id=189260
+
+ Reviewed by Sam Weinig.
+
+ 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-08-29 Emilio Cobos Álvarez <emi...@crisal.io>
Remove PseudoElementUserAgentCustom.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -47,7 +47,7 @@
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();
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.h (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.h 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.h 2018-09-05 04:32:59 UTC (rev 235657)
@@ -38,10 +38,9 @@
// 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;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -68,7 +68,7 @@
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);
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -111,7 +111,7 @@
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 @@
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())
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -97,7 +97,7 @@
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 @@
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)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -57,7 +57,7 @@
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)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -146,7 +146,7 @@
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 @@
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)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -35,7 +35,7 @@
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 @@
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)
Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -53,7 +53,7 @@
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 @@
paintInfo.context().setFillColor(backgroundColor);
paintInfo.context().fillRect(selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, style), backgroundColor);
- setPaintingResourceMode(RenderSVGResourceMode::ApplyToDefault);
+ setPaintingResourceMode({ });
}
ASSERT(!m_paintingResource);
@@ -326,7 +326,7 @@
if (decorations & TextDecoration::LineThrough)
paintDecoration(paintInfo.context(), TextDecoration::LineThrough, fragment);
- setPaintingResourceMode(RenderSVGResourceMode::ApplyToDefault);
+ setPaintingResourceMode({ });
}
// Finally, paint the outline if any.
@@ -339,7 +339,7 @@
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::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();
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (235656 => 235657)
--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2018-09-05 02:36:54 UTC (rev 235656)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2018-09-05 04:32:59 UTC (rev 235657)
@@ -57,7 +57,7 @@
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 @@
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 @@
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 @@
// (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;
