Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.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 27 matching lines @@
 #include "platform/fonts/UTF16TextIterator.h"
 #include "platform/fonts/opentype/OpenTypeCapsSupport.h"
 #include "platform/fonts/shaping/CaseMappingHarfBuzzBufferFiller.h"
 #include "platform/fonts/shaping/HarfBuzzFace.h"
 #include "platform/fonts/shaping/RunSegmenter.h"
 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h"
 #include "platform/text/Character.h"
 #include "platform/text/TextBreakIterator.h"
 #include "wtf/Compiler.h"
 #include "wtf/MathExtras.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/Unicode.h"
+
 #include <algorithm>
 #include <hb.h>
-#include <memory>
 #include <unicode/uchar.h>
 #include <unicode/uscript.h>
 
 namespace blink {
 
 template<typename T>
 class HarfBuzzScopedPtr {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(HarfBuzzScopedPtr);
 public:
@@ skipping 45 matching lines @@
 
         U16_APPEND(destination, *destinationLength, length, character, error);
         ASSERT_UNUSED(error, !error);
     }
 }
 
 HarfBuzzShaper::HarfBuzzShaper(const Font* font, const TextRun& run)
     : Shaper(font, run)
     , m_normalizedBufferLength(0)
 {
-    m_normalizedBuffer = wrapArrayUnique(new UChar[m_textRun.length() + 1]);
+    m_normalizedBuffer = adoptArrayPtr(new UChar[m_textRun.length() + 1]);
     normalizeCharacters(m_textRun, m_textRun.length(), m_normalizedBuffer.get(), &m_normalizedBufferLength);
     setFontFeatures();
 }
 
 static inline hb_feature_t createFeature(uint8_t c1, uint8_t c2, uint8_t c3, uint8_t c4, uint32_t value = 0)
 {
     return { HB_TAG(c1, c2, c3, c4), value, 0 /* start */, static_cast<unsigned>(-1) /* end */ };
 }
 
 void HarfBuzzShaper::setFontFeatures()
@@ skipping 332 matching lines @@
         // When we're getting here with the last resort font, we have no other
         // choice than adding boxes to the ShapeResult.
         if ((currentClusterResult == NotDef && numCharacters) || isLastResort) {
             hb_direction_t direction = TextDirectionToHBDirection(
                 m_textRun.direction(),
                 m_font->getFontDescription().orientation(), currentFont);
             // Here we need to specify glyph positions.
             ShapeResult::RunInfo* run = new ShapeResult::RunInfo(currentFont,
                 direction, ICUScriptToHBScript(currentRunScript),
                 startIndex, numGlyphsToInsert, numCharacters);
-            shapeResult->insertRun(wrapUnique(run), lastChangePosition,
+            shapeResult->insertRun(adoptPtr(run), lastChangePosition,
                 numGlyphsToInsert,
                 harfBuzzBuffer);
         }
         lastChangePosition = glyphIndex;
     }
     return true;
 }
 
 static inline const SimpleFontData* fontDataAdjustedForOrientation(const SimpleFontData* originalFont,
     FontOrientation runOrientation,
@@ skipping 193 matching lines @@
             hb_buffer_reset(harfBuzzBuffer.get());
         }
     }
     return result.release();
 }
 
 PassRefPtr<ShapeResult> ShapeResult::createForTabulationCharacters(const Font* font,
     const TextRun& textRun, float positionOffset, unsigned count)
 {
     const SimpleFontData* fontData = font->primaryFont();
-    std::unique_ptr<ShapeResult::RunInfo> run = wrapUnique(new ShapeResult::RunInfo(fontData,
+    OwnPtr<ShapeResult::RunInfo> run = adoptPtr(new ShapeResult::RunInfo(fontData,
         // Tab characters are always LTR or RTL, not TTB, even when isVerticalAnyUpright().
         textRun.rtl() ? HB_DIRECTION_RTL : HB_DIRECTION_LTR,
         HB_SCRIPT_COMMON, 0, count, count));
     float position = textRun.xPos() + positionOffset;
     float startPosition = position;
     for (unsigned i = 0; i < count; i++) {
         float advance = font->tabWidth(*fontData, textRun.getTabSize(), position);
         run->m_glyphData[i].characterIndex = i;
         run->setGlyphAndPositions(i, fontData->spaceGlyph(), advance, 0, 0);
         position += advance;
     }
     run->m_width = position - startPosition;
 
     RefPtr<ShapeResult> result = ShapeResult::create(font, count, textRun.direction());
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
     result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright();
     result->m_runs.append(std::move(run));
     return result.release();
 }
 
 
 } // namespace blink