Tidy CFX_FixedBufGrow.

core/include/fxcrt/fx_basic.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
 #define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include <algorithm>
@@ skipping 558 matching lines @@
 
   void Add(ElementType data) {
     *(ElementType*)CFX_BaseSegmentedArray::Add() = data;
   }
 
   ElementType& operator[](int index) {
     return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index);
   }
 };
 #endif  // PDF_ENABLE_XFA
+
 template <class DataType, int FixedSize>
 class CFX_FixedBufGrow {
  public:
-  CFX_FixedBufGrow() : m_pData(NULL) {}
-  CFX_FixedBufGrow(int data_size) : m_pData(NULL) {
+  CFX_FixedBufGrow(int data_size) {

[Lei Zhang, 2016/02/19 23:57:25]

explicit

[Tom Sepez, 2016/02/20 00:27:47]

Done.

     if (data_size > FixedSize) {
-      m_pData = FX_Alloc(DataType, data_size);
-    } else {
-      FXSYS_memset(m_Data, 0, sizeof(DataType) * FixedSize);
+      m_pGrowData.reset(FX_Alloc(DataType, data_size));
+      return;
     }
+    FXSYS_memset(m_FixedData, 0, sizeof(DataType) * FixedSize);
   }
-  void SetDataSize(int data_size) {
-    FX_Free(m_pData);
-    m_pData = NULL;
-    if (data_size > FixedSize) {
-      m_pData = FX_Alloc(DataType, data_size);
-    } else {
-      FXSYS_memset(m_Data, 0, sizeof(DataType) * FixedSize);
-    }
-  }
-  ~CFX_FixedBufGrow() { FX_Free(m_pData); }
-  operator DataType*() { return m_pData ? m_pData : m_Data; }
+  operator DataType*() { return m_pGrowData ? m_pGrowData.get() : m_FixedData; }
 
  private:
-  DataType m_Data[FixedSize];
-  DataType* m_pData;
+  DataType m_FixedData[FixedSize];
+  std::unique_ptr<DataType, FxFreeDeleter> m_pGrowData;
 };
+
 #ifdef PDF_ENABLE_XFA
 class CFX_MapPtrToPtr {
  protected:
   struct CAssoc {
     CAssoc* pNext;
 
     void* key;
 
     void* value;
   };
@@ skipping 555 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_