fgas/ code cleanup.

xfa/fgas/crt/fgas_memory.cpp

 // 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
 
 #include "xfa/fgas/crt/fgas_memory.h"
 
 #ifndef MEMORY_TOOL_REPLACES_ALLOCATOR
 #define MEMORY_TOOL_REPLACES_ALLOCATOR  // Temporary, for CF testing.
 #endif
 
 #include <algorithm>
 
 #ifdef MEMORY_TOOL_REPLACES_ALLOCATOR
 
 namespace {
 
 class CFX_DefStore : public IFX_MemoryAllocator, public CFX_Target {
  public:
   CFX_DefStore() {}
   ~CFX_DefStore() override {}
+
   void* Alloc(size_t size) override { return FX_Alloc(uint8_t, size); }
   void Free(void* pBlock) override { FX_Free(pBlock); }
 };
 
 }  // namespace
 
 IFX_MemoryAllocator* IFX_MemoryAllocator::Create(FX_ALLOCTYPE eType,
                                                  size_t chunkSize,
                                                  size_t blockSize) {
   return new CFX_DefStore();
 }
 
 #else  // MEMORY_TOOL_REPLACES_ALLOCATOR
 
 namespace {
 
 struct FX_STATICSTORECHUNK {
   FX_STATICSTORECHUNK* pNextChunk;
   size_t iChunkSize;
   size_t iFreeSize;
 };
 
 class CFX_StaticStore : public IFX_MemoryAllocator, public CFX_Target {
  public:
-  CFX_StaticStore(size_t iDefChunkSize = 4096);
+  CFX_StaticStore(size_t iDefChunkSize);
   ~CFX_StaticStore() override;
+
   void* Alloc(size_t size) override;
   void Free(void* pBlock) override {}
 
- protected:
+ private:
   size_t m_iAllocatedSize;
   size_t m_iDefChunkSize;
   FX_STATICSTORECHUNK* m_pChunk;
   FX_STATICSTORECHUNK* m_pLastChunk;
   FX_STATICSTORECHUNK* AllocChunk(size_t size);
   FX_STATICSTORECHUNK* FindChunk(size_t size);
 };
 
 struct FX_FIXEDSTORECHUNK {
   uint8_t* FirstFlag() { return reinterpret_cast<uint8_t*>(this + 1); }
   uint8_t* FirstBlock() { return FirstFlag() + iChunkSize; }
 
   FX_FIXEDSTORECHUNK* pNextChunk;
   size_t iChunkSize;
   size_t iFreeNum;
 };
 
 class CFX_FixedStore : public IFX_MemoryAllocator, public CFX_Target {
  public:
   CFX_FixedStore(size_t iBlockSize, size_t iBlockNumsInChunk);
   ~CFX_FixedStore() override;
   void* Alloc(size_t size) override;
   void Free(void* pBlock) override;
 
- protected:
+ private:
   FX_FIXEDSTORECHUNK* AllocChunk();
 
   size_t m_iBlockSize;
   size_t m_iDefChunkSize;
   FX_FIXEDSTORECHUNK* m_pChunk;
 };
 
 }  // namespace
 
 #define FX_4BYTEALIGN(size) (((size) + 3) & ~3)
@@ skipping 154 matching lines @@
   }
 }
 size_t CFX_FixedStore::SetDefChunkSize(size_t iChunkSize) {
   ASSERT(iChunkSize != 0);
   size_t v = m_iDefChunkSize;
   m_iDefChunkSize = FX_4BYTEALIGN(iChunkSize);
   return v;
 }
 
 #endif  // MEMORY_TOOL_REPLACES_ALLOCATOR