Merge 2 CLs to M53.

fpdfsdk/javascript/JS_Object.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 FPDFSDK_JAVASCRIPT_JS_OBJECT_H_
 #define FPDFSDK_JAVASCRIPT_JS_OBJECT_H_
 
 #include <map>
 #include <memory>
 
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
 #include "fpdfsdk/jsapi/include/fxjs_v8.h"
 
 class CJS_Context;
 class CJS_Object;
 class CJS_Timer;
 class CPDFDoc_Environment;
+
 class CJS_EmbedObj {
  public:
   explicit CJS_EmbedObj(CJS_Object* pJSObject);
   virtual ~CJS_EmbedObj();
 
   virtual void TimerProc(CJS_Timer* pTimer) {}
+  virtual void CancelProc(CJS_Timer* pTimer) {}
 
   CJS_Object* GetJSObject() const { return m_pJSObject; }
 
   int MsgBox(CPDFDoc_Environment* pApp,
              const FX_WCHAR* swMsg,
              const FX_WCHAR* swTitle,
              FX_UINT nType,
              FX_UINT nIcon);
   void Alert(CJS_Context* pContext, const FX_WCHAR* swMsg);
 
@@ skipping 40 matching lines @@
  public:
   CJS_Timer(CJS_EmbedObj* pObj,
             CPDFDoc_Environment* pApp,
             CJS_Runtime* pRuntime,
             int nType,
             const CFX_WideString& script,
             uint32_t dwElapse,
             uint32_t dwTimeOut);
   ~CJS_Timer() override;
 
-  void KillJSTimer();
+  static void Trigger(int nTimerID);
+  static void Cancel(int nTimerID);
 
-  int GetType() const { return m_nType; }
+  bool IsOneShot() const { return m_nType == 1; }
   uint32_t GetTimeOut() const { return m_dwTimeOut; }
+  int GetTimerID() const { return m_nTimerID; }
   CJS_Runtime* GetRuntime() const { return m_bValid ? m_pRuntime : nullptr; }
   CFX_WideString GetJScript() const { return m_swJScript; }
 
-  static void TimerProc(int idEvent);
-
  private:
   using TimerMap = std::map<FX_UINT, CJS_Timer*>;
   static TimerMap* GetGlobalTimerMap();
 
   // CJS_Runtime::Observer
   void OnDestroyed() override;
 
   uint32_t m_nTimerID;
   CJS_EmbedObj* const m_pEmbedObj;
   bool m_bProcessing;
   bool m_bValid;
 
   // data
   const int m_nType;  // 0:Interval; 1:TimeOut
   const uint32_t m_dwTimeOut;
   const CFX_WideString m_swJScript;
   CJS_Runtime* const m_pRuntime;
   CPDFDoc_Environment* const m_pApp;
 };
 
 #endif  // FPDFSDK_JAVASCRIPT_JS_OBJECT_H_