[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Dirk Schulze <krit@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.
@@ skipping 13 matching lines @@
 
 #include "core/SVGNames.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/PaintInfo.h"
 #include "core/svg/SVGGeometryElement.h"
 #include "core/svg/SVGUseElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 
 namespace blink {
 
 LayoutSVGResourceClipper::LayoutSVGResourceClipper(SVGClipPathElement* node)
     : LayoutSVGResourceContainer(node), m_inClipExpansion(false) {}
 
 LayoutSVGResourceClipper::~LayoutSVGResourceClipper() {}
 
 void LayoutSVGResourceClipper::removeAllClientsFromCache(
@@ skipping 113 matching lines @@
     transform.translate(referenceBox.x(), referenceBox.y());
     transform.scaleNonUniform(referenceBox.width(), referenceBox.height());
     clipPath.transform(transform);
   }
 
   // Transform path by animatedLocalTransform.
   clipPath.transform(animatedLocalTransform);
   return true;
 }
 
-sk_sp<const SkPicture> LayoutSVGResourceClipper::createContentPicture() {
+sk_sp<const CdlPicture> LayoutSVGResourceClipper::createContentPicture() {
   ASSERT(frame());
   if (m_clipContentPicture)
     return m_clipContentPicture;
 
   // Using strokeBoundingBox (instead of visualRectInLocalSVGCoordinates) to
   // avoid the intersection with local clips/mask, which may yield incorrect
   // results when mixing objectBoundingBox and userSpaceOnUse units
   // (http://crbug.com/294900).
   FloatRect bounds = strokeBoundingBox();
 
@@ skipping 129 matching lines @@
       toSVGClipPathElement(element())->calculateTransform(
           SVGElement::IncludeMotionTransform);
   if (clipPathUnits() == SVGUnitTypes::kSvgUnitTypeObjectboundingbox) {
     transform.translate(referenceBox.x(), referenceBox.y());
     transform.scaleNonUniform(referenceBox.width(), referenceBox.height());
   }
   return transform.mapRect(m_localClipBounds);
 }
 
 }  // namespace blink