Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * ON ANY 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/GlyphPageTreeNode.h"
 
 #include "platform/fonts/SegmentedFontData.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/opentype/OpenTypeVerticalData.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/CharacterNames.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 #include <stdio.h>
 
 namespace blink {
 
 using std::max;
 using std::min;
 
 HashMap<int, GlyphPageTreeNode*>* GlyphPageTreeNode::roots = 0;
 GlyphPageTreeNode* GlyphPageTreeNode::pageZeroRoot = 0;
 
@@ skipping 301 matching lines @@
 
     GlyphPageTreeNode* child = new GlyphPageTreeNode(this);
     if (fontData->isCustomFont()) {
         for (GlyphPageTreeNode* curr = this; curr; curr = curr->m_parent)
             curr->m_customFontCount++;
     }
 
 #if ENABLE(ASSERT)
     child->m_pageNumber = m_pageNumber;
 #endif
-    m_children.set(fontData, wrapUnique(child));
+    m_children.set(fontData, adoptPtr(child));
     fontData->setMaxGlyphPageTreeLevel(max(fontData->maxGlyphPageTreeLevel(), child->m_level));
     child->initializePage(fontData, pageNumber);
     return child;
 }
 
 SystemFallbackGlyphPageTreeNode* GlyphPageTreeNode::getSystemFallbackChild(unsigned pageNumber)
 {
     ASSERT(pageNumber == m_pageNumber);
 
     if (m_systemFallbackChild)
         return m_systemFallbackChild.get();
 
     SystemFallbackGlyphPageTreeNode* child = new SystemFallbackGlyphPageTreeNode(this);
-    m_systemFallbackChild = wrapUnique(child);
+    m_systemFallbackChild = adoptPtr(child);
 #if ENABLE(ASSERT)
     child->m_pageNumber = m_pageNumber;
 #endif
     return child;
 }
 
 void GlyphPageTreeNode::pruneCustomFontData(const FontData* fontData)
 {
     if (!fontData || !m_customFontCount)
         return;
 
     // Prune any branch that contains this FontData.
-    if (std::unique_ptr<GlyphPageTreeNode> node = m_children.take(fontData)) {
+    if (OwnPtr<GlyphPageTreeNode> node = m_children.take(fontData)) {
         if (unsigned customFontCount = node->m_customFontCount + 1) {
             for (GlyphPageTreeNode* curr = this; curr; curr = curr->m_parent)
                 curr->m_customFontCount -= customFontCount;
         }
     }
 
     // Check any branches that remain that still have custom fonts underneath them.
     if (!m_customFontCount)
         return;
 
     GlyphPageTreeNodeMap::iterator end = m_children.end();
     for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it)
         it->value->pruneCustomFontData(fontData);
 }
 
 void GlyphPageTreeNode::pruneFontData(const SimpleFontData* fontData, unsigned level)
 {
     ASSERT(fontData);
 
     // Prune fall back child (if any) of this font.
     if (m_systemFallbackChild)
         m_systemFallbackChild->pruneFontData(fontData);
 
     // Prune from m_page if it's a mixed page.
     if (m_page && m_page->hasPerGlyphFontData())
         m_page->removePerGlyphFontData(fontData);
 
     // Prune any branch that contains this FontData.
-    if (std::unique_ptr<GlyphPageTreeNode> node = m_children.take(fontData)) {
+    if (OwnPtr<GlyphPageTreeNode> node = m_children.take(fontData)) {
         if (unsigned customFontCount = node->m_customFontCount) {
             for (GlyphPageTreeNode* curr = this; curr; curr = curr->m_parent)
                 curr->m_customFontCount -= customFontCount;
         }
     }
 
     level++;
     if (level > fontData->maxGlyphPageTreeLevel())
         return;
 
@@ skipping 26 matching lines @@
     // entries may use different fonts depending on character. If the Font
     // ever finds it needs a glyph out of the system fallback page, it will
     // ask the system for the best font to use and fill that glyph in for us.
     if (GlyphPage* parentPage = m_parent->page())
         return parentPage->createCopiedSystemFallbackPage(this);
     return GlyphPage::createForMixedFontData(this);
 }
 
 } // namespace blink