Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/image-decoders/gif/GIFImageReader.cpp

 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 57 matching lines @@
 
 CompuServe Incorporated maintains a mailing list with all those individuals and
 organizations who wish to receive copies of this document when it is corrected
 or revised. This service is offered free of charge; please provide us with your
 mailing address.
 */
 
 #include "platform/image-decoders/gif/GIFImageReader.h"
 
 #include "platform/Histogram.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/Threading.h"
+
 #include <string.h>
 
 using blink::GIFImageDecoder;
 
 // GETN(n, s) requests at least 'n' bytes available from 'q', at start of state 's'.
 //
 // Note, the hold will never need to be bigger than 256 bytes to gather up in the hold,
 // as each GIF block (except colormaps) can never be bigger than 256 bytes.
 // Colormaps are directly copied in the resp. global_colormap or dynamically allocated local_colormap.
 // So a fixed buffer in GIFImageReader is good enough.
@@ skipping 239 matching lines @@
 bool GIFFrameContext::decode(blink::FastSharedBufferReader* reader, blink::GIFImageDecoder* client, bool* frameDecoded)
 {
     m_localColorMap.buildTable(reader);
 
     *frameDecoded = false;
     if (!m_lzwContext) {
         // Wait for more data to properly initialize GIFLZWContext.
         if (!isDataSizeDefined() || !isHeaderDefined())
             return true;
 
-        m_lzwContext = wrapUnique(new GIFLZWContext(client, this));
+        m_lzwContext = adoptPtr(new GIFLZWContext(client, this));
         if (!m_lzwContext->prepareToDecode()) {
             m_lzwContext.reset();
             return false;
         }
 
         m_currentLzwBlock = 0;
     }
 
     // Some bad GIFs have extra blocks beyond the last row, which we don't want to decode.
     while (m_currentLzwBlock < m_lzwBlocks.size() && m_lzwContext->hasRemainingRows()) {
@@ skipping 470 matching lines @@
 
 void GIFImageReader::setRemainingBytes(size_t remainingBytes)
 {
     ASSERT(remainingBytes <= m_data->size());
     m_bytesRead = m_data->size() - remainingBytes;
 }
 
 void GIFImageReader::addFrameIfNecessary()
 {
     if (m_frames.isEmpty() || m_frames.last()->isComplete())
-        m_frames.append(wrapUnique(new GIFFrameContext(m_frames.size())));
+        m_frames.append(adoptPtr(new GIFFrameContext(m_frames.size())));
 }
 
 // FIXME: Move this method to close to doLZW().
 bool GIFLZWContext::prepareToDecode()
 {
     ASSERT(m_frameContext->isDataSizeDefined() && m_frameContext->isHeaderDefined());
 
     // Since we use a codesize of 1 more than the datasize, we need to ensure
     // that our datasize is strictly less than the MAX_DICTIONARY_ENTRY_BITS.
     if (m_frameContext->dataSize() >= MAX_DICTIONARY_ENTRY_BITS)
@@ skipping 33 matching lines @@
     rowIter = rowBuffer.begin();
     rowsRemaining = m_frameContext->height();
 
     // Clearing the whole suffix table lets us be more tolerant of bad data.
     for (int i = 0; i < clearCode; ++i) {
         suffix[i] = i;
         suffixLength[i] = 1;
     }
     return true;
 }