Changeset 220616 in webkit

Timestamp:

Aug 11, 2017 3:43:01 PM (7 years ago)

Author:

Simon Fraser

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGResourceContainer.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceContainer.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceGradient.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGResourceGradient.h (modified) (1 diff)
• rendering/svg/RenderSVGResourcePattern.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourcePattern.h (modified) (1 diff)
• rendering/svg/RenderSVGShape.cpp (modified) (2 diffs)
• rendering/svg/SVGRenderingContext.cpp (modified) (2 diffs)
• rendering/svg/SVGRenderingContext.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-11  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

@@ -38 +38 @@
     : RenderSVGHiddenContainer(element, WTFMove(style))
     , m_id(element.getIdAttribute())
-    , m_registered(false)
-    , m_isInvalidating(false)
 {
 }

trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h

@@ -71 +71 @@
 
     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 };
 };
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp

@@ -33 +33 @@
 RenderSVGResourceGradient::RenderSVGResourceGradient(SVGGradientElement& node, RenderStyle&& style)
     : RenderSVGResourceContainer(node, WTFMove(style))
-    , m_shouldCollectGradientAttributes(true)
-#if USE(CG)
-    , m_savedContext(0)
-#endif
 {
 }
@@ -201 +197 @@
             // Restore on-screen drawing context
             context = m_savedContext;
-            m_savedContext = 0;
+            m_savedContext = nullptr;
 
             AffineTransform gradientTransform;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h

@@ -66 +66 @@
 
 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 };
 };
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

@@ -35 +35 @@
 RenderSVGResourcePattern::RenderSVGResourcePattern(SVGPatternElement& element, RenderStyle&& style)
     : RenderSVGResourceContainer(element, WTFMove(style))
-    , m_shouldCollectPatternAttributes(true)
 {
 }

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h

@@ -64 +64 @@
     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 };
 };
 

trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp

@@ -237 +237 @@
     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);
         }
     }
@@ -253 +253 @@
     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);
         }
     }

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp

@@ -57 +57 @@
         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;
@@ -82 +82 @@
     m_renderer = &renderer;
     m_paintInfo = &paintInfo;
-    m_filter = 0;
+    m_filter = nullptr;
 
     // We need to save / restore the context even if the initialization failed.

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h

@@ -46 +46 @@
     // 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);
@@ -103 +93 @@
     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 };
 };