Replace OwnPtr with WTF::Optional for optional recorders.

Source/core/paint/SVGShapePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGShapePainter.h"
 
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGShape.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGMarkerData.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/SVGContainerPainter.h"
 #include "core/paint/SVGPaintContext.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/graphics/paint/DisplayItemListContextRecorder.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "wtf/Optional.h"
 
 namespace blink {
 
 static bool setupNonScalingStrokeContext(AffineTransform& strokeTransform, GraphicsContextStateSaver& stateSaver)
 {
     if (!strokeTransform.isInvertible())
         return false;
 
     stateSaver.save();
     stateSaver.context()->concatCTM(strokeTransform.inverse());
@@ skipping 179 matching lines @@
         DisplayItemListContextRecorder contextRecorder(*paintInfo.context);
         PaintInfo markerPaintInfo(paintInfo);
         markerPaintInfo.context = &contextRecorder.context();
 
         // It's expensive to track the transformed paint cull rect for each
         // marker so just disable culling. The shape paint call will already be
         // culled if it is outside the paint info cull rect.
         markerPaintInfo.rect = LayoutRect::infiniteIntRect();
 
         TransformRecorder transformRecorder(*markerPaintInfo.context, marker, marker.markerTransformation(position.origin, position.angle, strokeWidth));
-        OwnPtr<FloatClipRecorder> clipRecorder;
+        Optional<FloatClipRecorder> clipRecorder;
         if (SVGLayoutSupport::isOverflowHidden(&marker))
-            clipRecorder = adoptPtr(new FloatClipRecorder(*markerPaintInfo.context, marker, markerPaintInfo.phase, marker.viewport()));
+            clipRecorder.emplace(*markerPaintInfo.context, marker, markerPaintInfo.phase, marker.viewport());
 
         SVGContainerPainter(marker).paint(markerPaintInfo);
     }
 }
 
 void SVGShapePainter::strokeZeroLengthLineCaps(GraphicsContext* context, const SkPaint& strokePaint)
 {
     const Vector<FloatPoint>* zeroLengthLineCaps = m_layoutSVGShape.zeroLengthLineCaps();
     if (!zeroLengthLineCaps || zeroLengthLineCaps->isEmpty())
         return;
@@ skipping 17 matching lines @@
         // This open-codes LayoutSVGShape::nonScalingStrokePath, because the
         // requirements here differ (we have a temporary path that we can
         // mutate.)
         if (m_layoutSVGShape.hasNonScalingStroke())
             tempPath.transform(nonScalingTransform);
         context->drawPath(tempPath.skPath(), fillPaint);
     }
 }
 
 } // namespace blink