2 files changed, 31 insertions, 17 deletions
diff --git a/core/fxcrt/cfx_fixedbufgrow.h b/core/fxcrt/cfx_fixedbufgrow.h
new file mode 100644
index 0000000000..b12b710473
--- /dev/null
+++ b/core/fxcrt/cfx_fixedbufgrow.h
@@ -0,0 +1,31 @@
+// Copyright 2017 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_FXCRT_CFX_FIXEDBUFGROW_H_
+#define CORE_FXCRT_CFX_FIXEDBUFGROW_H_
+
+#include <memory>
+
+#include "core/fxcrt/fx_memory.h"
+
+template <class DataType, int FixedSize>
+class CFX_FixedBufGrow {
+ public:
+  explicit CFX_FixedBufGrow(int data_size) {
+    if (data_size > FixedSize) {
+      m_pGrowData.reset(FX_Alloc(DataType, data_size));
+      return;
+    }
+    memset(m_FixedData, 0, sizeof(DataType) * FixedSize);
+  }
+  operator DataType*() { return m_pGrowData ? m_pGrowData.get() : m_FixedData; }
+
+ private:
+  DataType m_FixedData[FixedSize];
+  std::unique_ptr<DataType, FxFreeDeleter> m_pGrowData;
+};
+
+#endif  // CORE_FXCRT_CFX_FIXEDBUFGROW_H_
diff --git a/core/fxcrt/fx_basic.h b/core/fxcrt/fx_basic.h
index f3eb03f925..7d3f3291c1 100644
--- a/core/fxcrt/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -22,23 +22,6 @@
 #define FX_IsOdd(a) ((a)&1)
 #endif  // PDF_ENABLE_XFA
 
-template <class DataType, int FixedSize>
-class CFX_FixedBufGrow {
- public:
-  explicit CFX_FixedBufGrow(int data_size) {
-    if (data_size > FixedSize) {
-      m_pGrowData.reset(FX_Alloc(DataType, data_size));
-      return;
-    }
-    memset(m_FixedData, 0, sizeof(DataType) * FixedSize);
-  }
-  operator DataType*() { return m_pGrowData ? m_pGrowData.get() : m_FixedData; }
-
- private:
-  DataType m_FixedData[FixedSize];
-  std::unique_ptr<DataType, FxFreeDeleter> m_pGrowData;
-};
-
 class IFX_Pause {
  public:
   virtual ~IFX_Pause() {}