Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/fonts/shaping/ShapeResult.h"
 
 #include "platform/fonts/Font.h"
 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h"
 #include "platform/fonts/shaping/ShapeResultSpacing.h"
-#include "wtf/PtrUtil.h"
 #include <hb.h>
-#include <memory>
 
 namespace blink {
 
 float ShapeResult::RunInfo::xPositionForVisualOffset(unsigned offset, AdjustMidCluster adjustMidCluster) const
 {
     ASSERT(offset < m_numCharacters);
     if (rtl())
         offset = m_numCharacters - offset - 1;
     return xPositionForOffset(offset, adjustMidCluster);
 }
@@ skipping 99 matching lines @@
     : m_width(other.m_width)
     , m_glyphBoundingBox(other.m_glyphBoundingBox)
     , m_primaryFont(other.m_primaryFont)
     , m_numCharacters(other.m_numCharacters)
     , m_numGlyphs(other.m_numGlyphs)
     , m_direction(other.m_direction)
     , m_hasVerticalOffsets(other.m_hasVerticalOffsets)
 {
     m_runs.reserveCapacity(other.m_runs.size());
     for (const auto& run : other.m_runs)
-        m_runs.append(wrapUnique(new ShapeResult::RunInfo(*run)));
+        m_runs.append(adoptPtr(new ShapeResult::RunInfo(*run)));
 }
 
 ShapeResult::~ShapeResult()
 {
 }
 
 size_t ShapeResult::byteSize() const
 {
     size_t selfByteSize = sizeof(this);
     for (unsigned i = 0; i < m_runs.size(); ++i) {
@@ skipping 103 matching lines @@
     RefPtr<ShapeResult> result = ShapeResult::create(*this);
     result->applySpacing(spacing, run);
     return result.release();
 }
 
 static inline float harfBuzzPositionToFloat(hb_position_t value)
 {
     return static_cast<float>(value) / (1 << 16);
 }
 
-void ShapeResult::insertRun(std::unique_ptr<ShapeResult::RunInfo> runToInsert,
+void ShapeResult::insertRun(PassOwnPtr<ShapeResult::RunInfo> runToInsert,
     unsigned startGlyph, unsigned numGlyphs, hb_buffer_t* harfBuzzBuffer)
 {
     ASSERT(numGlyphs > 0);
-    std::unique_ptr<ShapeResult::RunInfo> run(std::move(runToInsert));
+    OwnPtr<ShapeResult::RunInfo> run(std::move(runToInsert));
     ASSERT(numGlyphs == run->m_glyphData.size());
 
     const SimpleFontData* currentFontData = run->m_fontData.get();
     const hb_glyph_info_t* glyphInfos =
         hb_buffer_get_glyph_infos(harfBuzzBuffer, 0);
     const hb_glyph_position_t* glyphPositions =
         hb_buffer_get_glyph_positions(harfBuzzBuffer, 0);
     const unsigned startCluster =
         HB_DIRECTION_IS_FORWARD(hb_buffer_get_direction(harfBuzzBuffer))
         ? glyphInfos[startGlyph].cluster
@@ skipping 52 matching lines @@
                 break;
             }
         }
     }
     // If we didn't find an existing slot to place it, append.
     if (run)
         m_runs.append(std::move(run));
 }
 
 } // namespace blink