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

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

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2012 Zoltan Herczeg <zherczeg@webkit.org>.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #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"
 #include <memory>
 
 namespace blink {
 
 class LayoutObject;
 class LayoutSVGResourceFilter;
 class LayoutSVGResourceMasker;
@@ skipping 40 matching lines @@
     Optional<ScopedPaintChunkProperties> m_transformPropertyScope;
 };
 
 class SVGPaintContext {
     STACK_ALLOCATED();
 public:
     SVGPaintContext(const LayoutObject& object, const PaintInfo& paintInfo)
         : 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)
 #endif
     { }
 
     ~SVGPaintContext();
 
     PaintInfo& paintInfo() { return m_filterPaintInfo ? *m_filterPaintInfo : m_paintInfo; }
 
     // Return true if these operations aren't necessary or if they are successfully applied.
     bool applyClipMaskAndFilterIfNecessary();
 
     static void paintSubtree(GraphicsContext&, const LayoutObject*);
 
     // TODO(fs): This functions feels a bit misplaced (we don't want this to
     // turn into the new kitchen sink). Move it if a better location surfaces.
     static bool paintForLayoutObject(const PaintInfo&, const ComputedStyle&, const LayoutObject&, LayoutSVGResourceMode, SkPaint&, const AffineTransform* additionalPaintServerTransform = nullptr);
 
 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*);
 
     // Return true if no filtering is necessary or if the filter is successfully applied.
     bool applyFilterIfNecessary(SVGResources*);
 
     bool isIsolationInstalled() const;
 
     const LayoutObject& m_object;
     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;
 #endif
 };
 
 } // namespace blink
 
 #endif // SVGPaintContext_h