webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 21 deletions

diff --git a/Source/WebCore/rendering/svg/SVGRenderingContext.h b/Source/WebCore/rendering/svg/SVGRenderingContext.h
index 3bf604cc2..fb6c29c97 100644
--- a/Source/WebCore/rendering/svg/SVGRenderingContext.h
+++ b/Source/WebCore/rendering/svg/SVGRenderingContext.h
@@ -22,19 +22,17 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SVGRenderingContext_h
-#define SVGRenderingContext_h
+#pragma once
 
-#if ENABLE(SVG)
 #include "ImageBuffer.h"
 #include "PaintInfo.h"
 
 namespace WebCore {
 
 class AffineTransform;
+class FloatRect;
 class RenderElement;
 class RenderObject;
-class FloatRect;
 class RenderSVGResourceFilter;
 
 // SVGRenderingContext 
@@ -51,9 +49,7 @@ public:
         , m_renderer(nullptr)
         , m_paintInfo(nullptr)
         , m_savedContext(nullptr)
-#if ENABLE(FILTERS)
         , m_filter(nullptr)
-#endif
     {
     }
 
@@ -62,9 +58,7 @@ public:
         , m_renderer(nullptr)
         , m_paintInfo(nullptr)
         , m_savedContext(nullptr)
-#if ENABLE(FILTERS)
         , m_filter(nullptr)
-#endif
     {
         prepareToRenderSVGContent(object, paintinfo, needsGraphicsContextSave);
     }
@@ -76,17 +70,14 @@ public:
     void prepareToRenderSVGContent(RenderElement&, PaintInfo&, NeedsGraphicsContextSave = DontSaveGraphicsContext);
     bool isRenderingPrepared() const { return m_renderingFlags & RenderingPrepared; }
 
-    static bool createImageBuffer(const FloatRect& paintRect, const AffineTransform& absoluteTransform, std::unique_ptr<ImageBuffer>&, ColorSpace, RenderingMode);
-    // Patterns need a different float-to-integer coordinate mapping.
-    static bool createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, std::unique_ptr<ImageBuffer>&, ColorSpace, RenderingMode);
+    static std::unique_ptr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, ColorSpace, RenderingMode);
+    static std::unique_ptr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const FloatRect& clampedRect, ColorSpace, RenderingMode);
 
     static void renderSubtreeToImageBuffer(ImageBuffer*, RenderElement&, const AffineTransform&);
-    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, std::unique_ptr<ImageBuffer>&, bool safeToClear);
+    static void clipToImageBuffer(GraphicsContext&, const AffineTransform& absoluteTransform, const FloatRect& targetRect, std::unique_ptr<ImageBuffer>&, bool safeToClear);
 
-    static float calculateScreenFontSizeScalingFactor(const RenderObject*);
-    static void calculateTransformationToOutermostCoordinateSystem(const RenderObject*, AffineTransform& absoluteTransform);
-    static IntSize clampedAbsoluteSize(const IntSize&);
-    static FloatRect clampedAbsoluteTargetRect(const FloatRect& absoluteTargetRect);
+    static float calculateScreenFontSizeScalingFactor(const RenderObject&);
+    static AffineTransform calculateTransformationToOutermostCoordinateSystem(const RenderObject&);
     static void clear2DRotation(AffineTransform&);
 
     static IntRect calculateImageBufferRect(const FloatRect& targetRect, const AffineTransform& absoluteTransform)
@@ -116,12 +107,7 @@ private:
     PaintInfo* m_paintInfo;
     GraphicsContext* m_savedContext;
     LayoutRect m_savedPaintRect;
-#if ENABLE(FILTERS)
     RenderSVGResourceFilter* m_filter;
-#endif
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif // SVGRenderingContext_h