Diff
Modified: trunk/Source/WebCore/ChangeLog (220615 => 220616)
--- trunk/Source/WebCore/ChangeLog 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/ChangeLog 2017-08-11 22:43:01 UTC (rev 220616)
@@ -1,3 +1,34 @@
+2017-08-11 Simon Fraser <[email protected]>
+
+ Some RenderSVGResource cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=175494
+
+ Reviewed by Zalan Bujtas.
+
+ Use more initializers. Remove spurious use of bitfields that didn't save any space at all.
+ 0 -> nullptr.
+
+ No behavior change.
+
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::RenderSVGResourceContainer):
+ * rendering/svg/RenderSVGResourceContainer.h:
+ * rendering/svg/RenderSVGResourceGradient.cpp:
+ (WebCore::RenderSVGResourceGradient::RenderSVGResourceGradient):
+ (WebCore::RenderSVGResourceGradient::applyResource):
+ * rendering/svg/RenderSVGResourceGradient.h:
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ (WebCore::RenderSVGResourcePattern::RenderSVGResourcePattern):
+ * rendering/svg/RenderSVGResourcePattern.h:
+ * rendering/svg/RenderSVGShape.cpp:
+ (WebCore::RenderSVGShape::fillShape):
+ (WebCore::RenderSVGShape::strokeShape):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::~SVGRenderingContext):
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ * rendering/svg/SVGRenderingContext.h:
+ (WebCore::SVGRenderingContext::SVGRenderingContext):
+
2017-08-11 Tim Horton <[email protected]>
Fix the build with modern Clang's -Wexpansion-to-defined
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2017-08-11 22:43:01 UTC (rev 220616)
@@ -37,8 +37,6 @@
RenderSVGResourceContainer::RenderSVGResourceContainer(SVGElement& element, RenderStyle&& style)
: RenderSVGHiddenContainer(element, WTFMove(style))
, m_id(element.getIdAttribute())
- , m_registered(false)
- , m_isInvalidating(false)
{
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2017-08-11 22:43:01 UTC (rev 220616)
@@ -70,10 +70,10 @@
void registerResource();
AtomicString m_id;
- bool m_registered : 1;
- bool m_isInvalidating : 1;
HashSet<RenderElement*> m_clients;
HashSet<RenderLayer*> m_clientLayers;
+ bool m_registered { false };
+ bool m_isInvalidating { false };
};
inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& document, const AtomicString& id)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2017-08-11 22:43:01 UTC (rev 220616)
@@ -32,10 +32,6 @@
RenderSVGResourceGradient::RenderSVGResourceGradient(SVGGradientElement& node, RenderStyle&& style)
: RenderSVGResourceContainer(node, WTFMove(style))
- , m_shouldCollectGradientAttributes(true)
-#if USE(CG)
- , m_savedContext(0)
-#endif
{
}
@@ -200,7 +196,7 @@
if (m_savedContext && (gradientData = m_gradientMap.get(&renderer))) {
// Restore on-screen drawing context
context = m_savedContext;
- m_savedContext = 0;
+ m_savedContext = nullptr;
AffineTransform gradientTransform;
calculateGradientTransform(gradientTransform);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h 2017-08-11 22:43:01 UTC (rev 220616)
@@ -65,13 +65,14 @@
GradientSpreadMethod platformSpreadMethodFromSVGType(SVGSpreadMethodType) const;
private:
- bool m_shouldCollectGradientAttributes : 1;
HashMap<RenderObject*, std::unique_ptr<GradientData>> m_gradientMap;
#if USE(CG)
- GraphicsContext* m_savedContext;
+ GraphicsContext* m_savedContext { nullptr };
std::unique_ptr<ImageBuffer> m_imageBuffer;
#endif
+
+ bool m_shouldCollectGradientAttributes { true };
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2017-08-11 22:43:01 UTC (rev 220616)
@@ -34,7 +34,6 @@
RenderSVGResourcePattern::RenderSVGResourcePattern(SVGPatternElement& element, RenderStyle&& style)
: RenderSVGResourceContainer(element, WTFMove(style))
- , m_shouldCollectPatternAttributes(true)
{
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2017-08-11 22:43:01 UTC (rev 220616)
@@ -63,9 +63,9 @@
PatternData* buildPattern(RenderElement&, OptionSet<RenderSVGResourceMode>, GraphicsContext&);
- bool m_shouldCollectPatternAttributes : 1;
PatternAttributes m_attributes;
HashMap<RenderElement*, std::unique_ptr<PatternData>> m_patternMap;
+ bool m_shouldCollectPatternAttributes { true };
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp 2017-08-11 22:43:01 UTC (rev 220616)
@@ -236,12 +236,12 @@
Color fallbackColor;
if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(*this, style, fallbackColor)) {
if (fillPaintingResource->applyResource(*this, style, context, RenderSVGResourceMode::ApplyToFill))
- fillPaintingResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToFill, 0, this);
+ fillPaintingResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToFill, nullptr, this);
else if (fallbackColor.isValid()) {
RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
fallbackResource->setColor(fallbackColor);
if (fallbackResource->applyResource(*this, style, context, RenderSVGResourceMode::ApplyToFill))
- fallbackResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToFill, 0, this);
+ fallbackResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToFill, nullptr, this);
}
}
}
@@ -252,12 +252,12 @@
Color fallbackColor;
if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(*this, style, fallbackColor)) {
if (strokePaintingResource->applyResource(*this, style, context, RenderSVGResourceMode::ApplyToStroke))
- strokePaintingResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToStroke, 0, this);
+ strokePaintingResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToStroke, nullptr, this);
else if (fallbackColor.isValid()) {
RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
fallbackResource->setColor(fallbackColor);
if (fallbackResource->applyResource(*this, style, context, RenderSVGResourceMode::ApplyToStroke))
- fallbackResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToStroke, 0, this);
+ fallbackResource->postApplyResource(*this, context, RenderSVGResourceMode::ApplyToStroke, nullptr, this);
}
}
}
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2017-08-11 22:43:01 UTC (rev 220616)
@@ -56,7 +56,7 @@
if (m_renderingFlags & EndFilterLayer) {
ASSERT(m_filter);
GraphicsContext* contextPtr = &m_paintInfo->context();
- m_filter->postApplyResource(*m_renderer, contextPtr, RenderSVGResourceMode::ApplyToDefault, 0, 0);
+ m_filter->postApplyResource(*m_renderer, contextPtr, RenderSVGResourceMode::ApplyToDefault, nullptr, nullptr);
m_paintInfo->setContext(*m_savedContext);
m_paintInfo->rect = m_savedPaintRect;
}
@@ -81,7 +81,7 @@
m_renderer = &renderer;
m_paintInfo = &paintInfo;
- m_filter = 0;
+ m_filter = nullptr;
// We need to save / restore the context even if the initialization failed.
if (needsGraphicsContextSave == SaveGraphicsContext) {
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h (220615 => 220616)
--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h 2017-08-11 22:35:30 UTC (rev 220615)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h 2017-08-11 22:43:01 UTC (rev 220616)
@@ -45,20 +45,10 @@
// Does not start rendering.
SVGRenderingContext()
- : m_renderingFlags(0)
- , m_renderer(nullptr)
- , m_paintInfo(nullptr)
- , m_savedContext(nullptr)
- , m_filter(nullptr)
{
}
SVGRenderingContext(RenderElement& object, PaintInfo& paintinfo, NeedsGraphicsContextSave needsGraphicsContextSave = DontSaveGraphicsContext)
- : m_renderingFlags(0)
- , m_renderer(nullptr)
- , m_paintInfo(nullptr)
- , m_savedContext(nullptr)
- , m_filter(nullptr)
{
prepareToRenderSVGContent(object, paintinfo, needsGraphicsContextSave);
}
@@ -102,12 +92,12 @@
// List of those flags which require actions during the destructor.
const static int ActionsNeeded = RestoreGraphicsContext | EndOpacityLayer | EndShadowLayer | EndFilterLayer;
- int m_renderingFlags;
- RenderElement* m_renderer;
- PaintInfo* m_paintInfo;
- GraphicsContext* m_savedContext;
+ RenderElement* m_renderer { nullptr };
+ PaintInfo* m_paintInfo { nullptr };
+ GraphicsContext* m_savedContext { nullptr };
+ RenderSVGResourceFilter* m_filter { nullptr };
LayoutRect m_savedPaintRect;
- RenderSVGResourceFilter* m_filter;
+ int m_renderingFlags { 0 };
};
} // namespace WebCore
