Add support for <basic-shape> to 'clip-path' on SVG elements

third_party/WebKit/Source/core/paint/SVGPaintContext.h

Index: third_party/WebKit/Source/core/paint/SVGPaintContext.h
diff --git a/third_party/WebKit/Source/core/paint/SVGPaintContext.h b/third_party/WebKit/Source/core/paint/SVGPaintContext.h
index 2ac2943310a4962627b3aa59bbda8c50d645f39c..2f621725bb4ff40fe953c0ae8d4258cbb30476c8 100644
--- a/third_party/WebKit/Source/core/paint/SVGPaintContext.h
+++ b/third_party/WebKit/Source/core/paint/SVGPaintContext.h
@@ -25,14 +25,12 @@
 #ifndef SVGPaintContext_h
 #define SVGPaintContext_h
 
-#include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/LayoutSVGResourcePaintServer.h"
+#include "core/paint/ClipPathClipper.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInfo.h"
-#include "core/paint/SVGClipPainter.h"
 #include "core/paint/SVGFilterPainter.h"
 #include "core/paint/TransformRecorder.h"
-#include "platform/graphics/paint/ClipPathRecorder.h"
 #include "platform/graphics/paint/CompositingRecorder.h"
 #include "platform/graphics/paint/ScopedPaintChunkProperties.h"
 #include "platform/transforms/AffineTransform.h"
@@ -93,8 +91,6 @@ public:
         : m_object(object)
         , m_paintInfo(paintInfo)
         , m_filter(nullptr)
-        , m_clipper(nullptr)
-        , m_clipperState(SVGClipPainter::ClipperNotApplied)
         , m_masker(nullptr)
 #if ENABLE(ASSERT)
         , m_applyClipMaskAndFilterIfNecessaryCalled(false)
@@ -116,9 +112,7 @@ public:
 
 private:
     void applyCompositingIfNecessary();
-
-    // Return true if no clipping is necessary or if the clip is successfully applied.
-    bool applyClipIfNecessary(SVGResources*);
+    void applyClipIfNecessary();
 
     // Return true if no masking is necessary or if the mask is successfully applied.
     bool applyMaskIfNecessary(SVGResources*);
@@ -132,11 +126,9 @@ private:
     PaintInfo m_paintInfo;
     std::unique_ptr<PaintInfo> m_filterPaintInfo;
     LayoutSVGResourceFilter* m_filter;
-    LayoutSVGResourceClipper* m_clipper;
-    SVGClipPainter::ClipperState m_clipperState;
     LayoutSVGResourceMasker* m_masker;
     std::unique_ptr<CompositingRecorder> m_compositingRecorder;
-    std::unique_ptr<ClipPathRecorder> m_clipPathRecorder;
+    Optional<ClipPathClipper> m_clipPathClipper;
     std::unique_ptr<SVGFilterRecordingContext> m_filterRecordingContext;
 #if ENABLE(ASSERT)
     bool m_applyClipMaskAndFilterIfNecessaryCalled;