Remove static declared SymbolDictCache.

core/src/fxcodec/jbig2/JBig2_Context.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 <map>
 #include <list>
 #include "JBig2_Context.h"
 
 // Implement a very small least recently used (LRU) cache. It is very
 // common for a JBIG2 dictionary to span multiple pages in a PDF file,
 // and we do not want to decode the same dictionary over and over
 // again. We key off of the memory location of the dictionary. The
 // list keeps track of the freshness of entries, with freshest ones
 // at the front. Even a tiny cache size like 2 makes a dramatic
 // difference for typical JBIG2 documents.
 const int kSymbolDictCacheMaxSize = 2;
-typedef std::pair<FX_BYTE*, CJBig2_SymbolDict*> CJBig2_CachePair;
-static std::list<CJBig2_CachePair> SymbolDictCache;
 
 void OutputBitmap(CJBig2_Image* pImage)
 {
     if(!pImage) {
         return;
     }
 }
 CJBig2_Context *CJBig2_Context::CreateContext(CJBig2_Module *pModule, FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
-        FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, IFX_Pause* pPause)
+        FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
 {
-    return new(pModule) CJBig2_Context(pGlobalData, dwGlobalLength, pData, dwLength, nStreamType, pPause);
+    return new(pModule)CJBig2_Context(pGlobalData, dwGlobalLength, pData, dwLength, nStreamType, pSymbolDictCache, pPause);
 }
 void CJBig2_Context::DestroyContext(CJBig2_Context *pContext)
 {
     if(pContext) {
         delete pContext;
     }
 }
 CJBig2_Context::CJBig2_Context(FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
-                               FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, IFX_Pause* pPause)
+                               FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
 {
     if(pGlobalData && (dwGlobalLength > 0)) {
         JBIG2_ALLOC(m_pGlobalContext, CJBig2_Context(NULL, 0, pGlobalData, dwGlobalLength,
-                    JBIG2_EMBED_STREAM, pPause));
+                    JBIG2_EMBED_STREAM, pSymbolDictCache, pPause));
     } else {
         m_pGlobalContext = NULL;
     }
     JBIG2_ALLOC(m_pStream, CJBig2_BitStream(pData, dwLength));
     m_nStreamType = nStreamType;
     m_nState = JBIG2_OUT_OF_PAGE;
     JBIG2_ALLOC(m_pSegmentList, CJBig2_List<CJBig2_Segment>);
     JBIG2_ALLOC(m_pPageInfoList, CJBig2_List<JBig2PageInfo>(1));
     m_pPage = NULL;
     m_bBufSpecified = FALSE;
     m_pPause = pPause;
     m_nSegmentDecoded = 0;
     m_PauseStep = 10;
     m_pArithDecoder = NULL;
     m_pGRD = NULL;
     m_gbContext = NULL;
     m_pSegment = NULL;
     m_dwOffset = 0;
     m_ProcessiveStatus = FXCODEC_STATUS_FRAME_READY;
+    m_pSymbolDictCache = pSymbolDictCache;
 }
 CJBig2_Context::~CJBig2_Context()
 {
     if(m_pArithDecoder) {
         delete m_pArithDecoder;
     }
     m_pArithDecoder = NULL;
     if(m_pGRD) {
         delete m_pGRD;
     }
@@ skipping 727 matching lines @@
             JBIG2_memset(gbContext, 0, sizeof(JBig2ArithCtx)*dwTemp);
         }
         if (pSymbolDictDecoder->SDREFAGG == 1) {
             dwTemp = pSymbolDictDecoder->SDRTEMPLATE ? 1 << 10 : 1 << 13;
             grContext = (JBig2ArithCtx*)m_pModule->JBig2_Malloc2(sizeof(JBig2ArithCtx), dwTemp);
             JBIG2_memset(grContext, 0, sizeof(JBig2ArithCtx)*dwTemp);
         }
     }
     pSegment->m_nResultType = JBIG2_SYMBOL_DICT_POINTER;
     for(std::list<CJBig2_CachePair>::iterator it =
-            SymbolDictCache.begin(); it != SymbolDictCache.end(); ++it) {
+            m_pSymbolDictCache->begin(); it != m_pSymbolDictCache->end(); ++it) {
         if (it->first == key) {
             pSegment->m_Result.sd = it->second->DeepCopy();
-            SymbolDictCache.push_front(*it);
-            SymbolDictCache.erase(it);
+            m_pSymbolDictCache->push_front(*it);
+            m_pSymbolDictCache->erase(it);
             cache_hit = true;
             break;
         }
     }
     if (!cache_hit) {
         if(pSymbolDictDecoder->SDHUFF == 0) {
             JBIG2_ALLOC(pArithDecoder, CJBig2_ArithDecoder(m_pStream));
             pSegment->m_Result.sd = pSymbolDictDecoder->decode_Arith(pArithDecoder, gbContext, grContext);
             delete pArithDecoder;
             if(pSegment->m_Result.sd == NULL) {
                 nRet = JBIG2_ERROR_FETAL;
                 goto failed;
             }
             m_pStream->alignByte();
             m_pStream->offset(2);
         } else {
             pSegment->m_Result.sd = pSymbolDictDecoder->decode_Huffman(m_pStream, gbContext, grContext, pPause);
             if(pSegment->m_Result.sd == NULL) {
                 nRet = JBIG2_ERROR_FETAL;
                 goto failed;
             }
             m_pStream->alignByte();
         }
         CJBig2_SymbolDict *value = pSegment->m_Result.sd->DeepCopy();
-        if (value) {
-            while (SymbolDictCache.size() >= kSymbolDictCacheMaxSize) {
-                delete SymbolDictCache.back().second;
-                SymbolDictCache.pop_back();
+        if (value && kSymbolDictCacheMaxSize > 0) {
+            while (m_pSymbolDictCache->size() >= kSymbolDictCacheMaxSize) {
+                delete m_pSymbolDictCache->back().second;
+                m_pSymbolDictCache->pop_back();
             }
-            SymbolDictCache.push_front(CJBig2_CachePair(key, value));
+            m_pSymbolDictCache->push_front(CJBig2_CachePair(key, value));
         }
     }
     if(wFlags & 0x0200) {
         pSegment->m_Result.sd->m_bContextRetained = TRUE;
         if(pSymbolDictDecoder->SDHUFF == 0) {
             pSegment->m_Result.sd->m_gbContext = gbContext;
         }
         if(pSymbolDictDecoder->SDREFAGG == 1) {
             pSegment->m_Result.sd->m_grContext = grContext;
         }
@@ skipping 983 matching lines @@
                 SBSYMCODES[CURTEMP].code = CURCODE;
                 CURCODE = CURCODE + 1;
             }
             CURTEMP = CURTEMP + 1;
         }
         CURLEN = CURLEN + 1;
     }
     m_pModule->JBig2_Free(LENCOUNT);
     m_pModule->JBig2_Free(FIRSTCODE);
 }