XFA: merge patch from issue 801913002 and 804463003

core/include/fpdfapi/fpdf_module.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 _FPDF_MODULE_
 #define _FPDF_MODULE_
 #ifndef _FXCRT_EXTENSION_
 #include "../fxcrt/fx_ext.h"
@@ skipping 30 matching lines @@
     }
     CCodec_ModuleMgr*           GetCodecModule()
     {
         return m_pCodecModule;
     }
 
     void                InitPageModule();
 
     void                InitRenderModule();
 
-
-    void                SetModulePath(FX_LPCSTR module_name, FX_LPCSTR path);
-
-    CFX_ByteString GetModuleFilePath(FX_LPCSTR module_name, FX_LPCSTR name);
-
     void                SetDownloadCallback(FX_BOOL (*callback)(FX_LPCSTR module_name));
 
     FX_BOOL             DownloadModule(FX_LPCSTR module_name);
 
     void                NotifyModuleAvailable(FX_LPCSTR module_name);
 
 
 
     CPDF_RenderModuleDef*       GetRenderModule() const
     {
@@ skipping 45 matching lines @@
 
     CCodec_ModuleMgr*           m_pCodecModule;
 
     CPDF_RenderModuleDef*       m_pRenderModule;
 
     CPDF_PageModuleDef*         m_pPageModule;
 
 
     FX_BOOL (*m_pDownloadCallback)(FX_LPCSTR module_name);
 
-    CFX_ByteString                      m_DefaultModulePath;
-
-    CFX_CMapByteStringToPtr     m_ModulePathList;
-
     CFX_MapByteStringToPtr      m_SecurityHandlerMap;
 
     CFX_PrivateData                     m_privateData;
 };
 class CPDF_Document;
 class CPDF_DocPageData;
 class CPDF_FontGlobals;
 class IPDF_FontMgr;
 class IPDF_FontMapper;
 class CPDF_ColorSpace;
@@ skipping 61 matching lines @@
     virtual void        DestroyPageCache(CPDF_PageRenderCache*) {}
 
     virtual void        NotifyDecoderAvailable() {}
 
     virtual CPDF_RenderConfig* GetConfig()
     {
         return NULL;
     }
 };
 #endif