Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/layout/shapes/RasterShape.h

 /*
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 17 matching lines @@
  */
 
 #ifndef RasterShape_h
 #define RasterShape_h
 
 #include "core/layout/shapes/Shape.h"
 #include "core/layout/shapes/ShapeInterval.h"
 #include "platform/geometry/FloatRect.h"
 #include "wtf/Assertions.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 namespace blink {
 
 class RasterShapeIntervals {
     USING_FAST_MALLOC(RasterShapeIntervals);
 public:
     RasterShapeIntervals(unsigned size, int offset = 0)
         : m_offset(offset)
     {
         m_intervals.resize(clampTo<int>(size));
     }
 
     void initializeBounds();
     const IntRect& bounds() const { return m_bounds; }
     bool isEmpty() const { return m_bounds.isEmpty(); }
 
     IntShapeInterval& intervalAt(int y)
     {
         ASSERT(y + m_offset >= 0 && static_cast<unsigned>(y + m_offset) < m_intervals.size());
         return m_intervals[y + m_offset];
     }
 
     const IntShapeInterval& intervalAt(int y) const
     {
         ASSERT(y + m_offset >= 0 && static_cast<unsigned>(y + m_offset) < m_intervals.size());
         return m_intervals[y + m_offset];
     }
 
-    std::unique_ptr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
+    PassOwnPtr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
 
     void buildBoundsPath(Path&) const;
 
 private:
     int size() const { return m_intervals.size(); }
     int offset() const { return m_offset; }
     int minY() const { return -m_offset; }
     int maxY() const { return -m_offset + m_intervals.size(); }
 
     IntRect m_bounds;
     Vector<IntShapeInterval> m_intervals;
     int m_offset;
 };
 
 class RasterShape final : public Shape {
     WTF_MAKE_NONCOPYABLE(RasterShape);
 public:
-    RasterShape(std::unique_ptr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
+    RasterShape(PassOwnPtr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
         : m_intervals(std::move(intervals))
         , m_marginRectSize(marginRectSize)
     {
         m_intervals->initializeBounds();
     }
 
     LayoutRect shapeMarginLogicalBoundingBox() const override { return static_cast<LayoutRect>(marginIntervals().bounds()); }
     bool isEmpty() const override { return m_intervals->isEmpty(); }
     LineSegment getExcludedInterval(LayoutUnit logicalTop, LayoutUnit logicalHeight) const override;
     void buildDisplayPaths(DisplayPaths& paths) const override
     {
         m_intervals->buildBoundsPath(paths.shape);
         if (shapeMargin())
             marginIntervals().buildBoundsPath(paths.marginShape);
     }
 
 private:
     const RasterShapeIntervals& marginIntervals() const;
 
-    std::unique_ptr<RasterShapeIntervals> m_intervals;
-    mutable std::unique_ptr<RasterShapeIntervals> m_marginIntervals;
+    OwnPtr<RasterShapeIntervals> m_intervals;
+    mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;
     IntSize m_marginRectSize;
 };
 
 } // namespace blink
 
 #endif // RasterShape_h