Unprefix -webkit-clip-path

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

 /*
  * Copyright (C) 2007, 2008 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) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 35 matching lines @@
 
         // Reset the paint info after the filter effect has been completed.
         m_filterPaintInfo = nullptr;
     }
 
     if (m_masker) {
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(&m_object));
         ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(&m_object)->masker() == m_masker);
         SVGMaskPainter(*m_masker).finishEffect(m_object, paintInfo().context);
     }
-
-    if (m_clipper) {
-        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(&m_object));
-        ASSERT(SVGResourcesCache::cachedResourcesForLayoutObject(&m_object)->clipper() == m_clipper);
-        SVGClipPainter(*m_clipper).finishEffect(m_object, paintInfo().context, m_clipperState);
-    }
 }
 
 bool SVGPaintContext::applyClipMaskAndFilterIfNecessary()
 {
 #if ENABLE(ASSERT)
     ASSERT(!m_applyClipMaskAndFilterIfNecessaryCalled);
     m_applyClipMaskAndFilterIfNecessaryCalled = true;
 #endif
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(&m_object);
 
     // When rendering clip paths as masks, only geometric operations should be included so skip
     // non-geometric operations such as compositing, masking, and filtering.
     if (paintInfo().isRenderingClipPathAsMaskImage()) {
-        if (!applyClipIfNecessary(resources))
-            return false;
+        DCHECK(!m_object.isSVGRoot());
+        applyClipIfNecessary(resources);
         return true;
     }
 
     bool isSVGRoot = m_object.isSVGRoot();
 
     // Layer takes care of root opacity and blend mode.
     if (isSVGRoot) {
         DCHECK(!(m_object.isTransparent() || m_object.styleRef().hasBlendMode()) || m_object.hasLayer());
     } else {
         applyCompositingIfNecessary();
     }
 
-    if (!applyClipIfNecessary(resources))
-        return false;
+    if (isSVGRoot) {
+        DCHECK(!m_object.styleRef().clipPath() || m_object.hasLayer());
+    } else {
+        applyClipIfNecessary(resources);
+    }
 
     if (!applyMaskIfNecessary(resources))
         return false;
 
     if (isSVGRoot) {
         DCHECK(!m_object.styleRef().hasFilter() || m_object.hasLayer());
     } else if (!applyFilterIfNecessary(resources)) {
         return false;
     }
 
@@ skipping 11 matching lines @@
     float opacity = style.opacity();
     WebBlendMode blendMode = style.hasBlendMode() && m_object.isBlendingAllowed() ?
         style.blendMode() : WebBlendModeNormal;
     if (opacity < 1 || blendMode != WebBlendModeNormal) {
         const FloatRect compositingBounds = m_object.paintInvalidationRectInLocalSVGCoordinates();
         m_compositingRecorder = wrapUnique(new CompositingRecorder(paintInfo().context, m_object,
             WebCoreCompositeToSkiaComposite(CompositeSourceOver, blendMode), opacity, &compositingBounds));
     }
 }
 
-bool SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
+void SVGPaintContext::applyClipIfNecessary(SVGResources* resources)
 {
-    // resources->clipper() corresponds to the non-prefixed 'clip-path' whereas
-    // m_object.style()->clipPath() corresponds to '-webkit-clip-path'.
-    // FIXME: We should unify the clip-path and -webkit-clip-path codepaths.
-    if (LayoutSVGResourceClipper* clipper = resources ? resources->clipper() : nullptr) {
-        if (!SVGClipPainter(*clipper).prepareEffect(m_object, m_object.objectBoundingBox(),
-            m_object.paintInvalidationRectInLocalSVGCoordinates(), FloatPoint(), paintInfo().context, m_clipperState))
-            return false;
-        m_clipper = clipper;
-    } else {
-        ClipPathOperation* clipPathOperation = m_object.style()->clipPath();
-        if (clipPathOperation && clipPathOperation->type() == ClipPathOperation::SHAPE) {
-            ShapeClipPathOperation* clipPath = toShapeClipPathOperation(clipPathOperation);
-            if (!clipPath->isValid())
-                return false;
-            m_clipPathRecorder = wrapUnique(new ClipPathRecorder(paintInfo().context, m_object, clipPath->path(m_object.objectBoundingBox())));
-        }
-    }
-    return true;
+    if (!m_object.styleRef().clipPath())
+        return;
+    m_clipPathClipper.emplace(paintInfo().context, m_object, m_object.objectBoundingBox(), FloatPoint());
 }
 
 bool SVGPaintContext::applyMaskIfNecessary(SVGResources* resources)
 {
     if (LayoutSVGResourceMasker* masker = resources ? resources->masker() : nullptr) {
         if (!SVGMaskPainter(*masker).prepareEffect(m_object, paintInfo().context))
             return false;
         m_masker = masker;
     }
     return true;
@@ skipping 22 matching lines @@
     }
     return true;
 }
 
 bool SVGPaintContext::isIsolationInstalled() const
 {
     if (m_compositingRecorder)
         return true;
     if (m_masker || m_filter)
         return true;
-    if (m_clipper && m_clipperState == SVGClipPainter::ClipperAppliedMask)
+    if (m_clipPathClipper && m_clipPathClipper->usingMask())
         return true;
     return false;
 }
 
 void SVGPaintContext::paintSubtree(GraphicsContext& context, const LayoutObject* item)
 {
     ASSERT(item);
     ASSERT(!item->needsLayout());
 
     PaintInfo info(context, LayoutRect::infiniteIntRect(), PaintPhaseForeground, GlobalPaintNormalPhase, PaintLayerNoFlag);
@@ skipping 34 matching lines @@
     // though.
     // Additionally, it's not really safe/guaranteed to be correct, as
     // something down the paint pipe may want to farther tweak the color
     // filter, which could yield incorrect results. (Consider just using
     // saveLayer() w/ this color filter explicitly instead.)
     paint.setColorFilter(sk_ref_sp(paintInfo.context.getColorFilter()));
     return true;
 }
 
 } // namespace blink