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 47 matching lines @@
 bool SVGPaintContext::applyClipMaskAndFilterIfNecessary()
 {
 #if ENABLE(ASSERT)
     ASSERT(!m_applyClipMaskAndFilterIfNecessaryCalled);
     m_applyClipMaskAndFilterIfNecessaryCalled = true;
 #endif
 
     // 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()) {
+        DCHECK(!m_object.isSVGRoot());
         applyClipIfNecessary();
         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();
     }
 
-    applyClipIfNecessary();
+    if (isSVGRoot) {
+        DCHECK(!m_object.styleRef().clipPath() || m_object.hasLayer());
+    } else {
+        applyClipIfNecessary();
+    }
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(&m_object);
 
     if (!applyMaskIfNecessary(resources))
         return false;
 
     if (isSVGRoot) {
         DCHECK(!m_object.styleRef().hasFilter() || m_object.hasLayer());
     } else if (!applyFilterIfNecessary(resources)) {
         return false;
@@ skipping 15 matching lines @@
         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));
     }
 }
 
 void SVGPaintContext::applyClipIfNecessary()
 {
-    ClipPathOperation* clipPathOperation = m_object.styleRef().svgStyle().clipPath();
-    // If no 'clip-path' is specified, try '-webkit-clip-path'.
-    if (!clipPathOperation) {
-        clipPathOperation = m_object.styleRef().clipPath();
-        // We don't support URL references in '-webkit-clip-path'.
-        if (clipPathOperation && clipPathOperation->type() == ClipPathOperation::REFERENCE)
-            clipPathOperation = nullptr;
-    }
+    ClipPathOperation* clipPathOperation = m_object.styleRef().clipPath();
     if (!clipPathOperation)
         return;
     m_clipPathClipper.emplace(paintInfo().context, *clipPathOperation, 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;
@@ skipping 80 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