Merge to XFA: Remove CJS_RuntimeFactory

New edits in:
  fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
  fpdfsdk/include/javascript/IJavaScript.h
  fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp

(cherry picked from commit bca779d0957965eb2ebfad5479e0894844749626)
Original Review URL: https://codereview.chromium.org/1360523004 .

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1348393007 .

3 files changed, 3 insertions, 25 deletions

diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
index bf96993bd3..49825c3f7f 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
@@ -8,7 +8,6 @@
 #define FPDFXFA_APP_H_

 

 class IFXJS_Runtime;

-class CJS_RuntimeFactory;

 

 class CPDFXFA_App : public IXFA_AppProvider {

  public:

@@ -28,8 +27,6 @@ class CPDFXFA_App : public IXFA_AppProvider {
   void ReleaseRuntime();

   FX_BOOL InitRuntime(FX_BOOL bReset = FALSE);

 

-  CJS_RuntimeFactory* GetRuntimeFactory() { return m_pJSRuntimeFactory; }

-

   // IFXA_AppProvider:

   void GetAppType(CFX_WideString& wsAppType) override;

   void SetAppType(const CFX_WideStringC& wsAppType) override;

@@ -89,7 +86,6 @@ class CPDFXFA_App : public IXFA_AppProvider {
   IXFA_FontMgr* m_pFontMgr;

   FXJSE_HRUNTIME m_hJSERuntime;

   IFXJS_Runtime* m_pJSRuntime;

-  CJS_RuntimeFactory* m_pJSRuntimeFactory;

   CFX_WideString m_csAppType;

 };

 

diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index c4879aa545..b76b16bd07 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -24,7 +24,6 @@
 #include "javascript/IJavaScript.h"
 
 class CFFL_IFormFiller;
-class CJS_RuntimeFactory;
 class CPDFSDK_ActionHandler;
 class CPDFSDK_Annot;
 class CPDFSDK_Document;
@@ -469,7 +468,7 @@ class CPDFDoc_Environment final {
  private:
   CPDFSDK_AnnotHandlerMgr* m_pAnnotHandlerMgr;
   CPDFSDK_ActionHandler* m_pActionHandler;
-  IFXJS_Runtime* m_pJSRuntime;
+  nonstd::unique_ptr<IFXJS_Runtime> m_pJSRuntime;
   FPDF_FORMFILLINFO* const m_pInfo;
   CPDFSDK_Document* m_pSDKDoc;
   CPDFXFA_Document* const m_pXFADoc;
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 65dae74ab4..d15ffc237e 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -134,10 +134,11 @@ class IFXJS_Context {
 
 class IFXJS_Runtime {
  public:
+  virtual ~IFXJS_Runtime() {}
+
   virtual IFXJS_Context* NewContext() = 0;
   virtual void ReleaseContext(IFXJS_Context* pContext) = 0;
   virtual IFXJS_Context* GetCurrentContext() = 0;
-
   virtual void SetReaderDocument(CPDFSDK_Document* pReaderDoc) = 0;
 
   virtual CPDFSDK_Document* GetReaderDocument() = 0;
@@ -146,24 +147,6 @@ class IFXJS_Runtime {
                                   FXJSE_HVALUE hValue) = 0;
   virtual FX_BOOL SetHValueByName(const CFX_ByteStringC& utf8Name,
                                   FXJSE_HVALUE hValue) = 0;
-
- protected:
-  virtual ~IFXJS_Runtime() {}
-};
-
-class CJS_RuntimeFactory {
- public:
-  CJS_RuntimeFactory() : m_bInit(false), m_nRef(0) {}
-  ~CJS_RuntimeFactory();
-
-  IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp);
-  void DeleteJSRuntime(IFXJS_Runtime* pRuntime);
-  void AddRef();
-  void Release();
-
- private:
-  bool m_bInit;
-  int m_nRef;
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_