Replace CJS_Runtime::Observer with CFX_Runtime<CJS_Runtime>::Observer

fpdfsdk/javascript/app.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 "fpdfsdk/javascript/app.h"
 
 #include <memory>
 #include <vector>
@@ skipping 12 matching lines @@
 
 class GlobalTimer : public CJS_Runtime::Observer {
  public:
   GlobalTimer(app* pObj,
               CPDFDoc_Environment* pApp,
               CJS_Runtime* pRuntime,
               int nType,
               const CFX_WideString& script,
               uint32_t dwElapse,
               uint32_t dwTimeOut);
-  ~GlobalTimer() override;
+  ~GlobalTimer();
 
   static void Trigger(int nTimerID);
   static void Cancel(int nTimerID);
 
   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; }
+  CJS_Runtime* GetRuntime() const { return m_pRuntime; }
   CFX_WideString GetJScript() const { return m_swJScript; }
 
  private:
   using TimerMap = std::map<FX_UINT, GlobalTimer*>;
   static TimerMap* GetGlobalTimerMap();
 
-  // CJS_Runtime::Observer
-  void OnDestroyed() override;
-
   uint32_t m_nTimerID;
   app* 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;
+  CJS_Runtime* m_pRuntime;
   CPDFDoc_Environment* const m_pApp;
 };
 
 GlobalTimer::GlobalTimer(app* pObj,
                          CPDFDoc_Environment* pApp,
                          CJS_Runtime* pRuntime,
                          int nType,
                          const CFX_WideString& script,
                          uint32_t dwElapse,
                          uint32_t dwTimeOut)
     : m_nTimerID(0),
       m_pEmbedObj(pObj),
       m_bProcessing(false),
-      m_bValid(true),
       m_nType(nType),
       m_dwTimeOut(dwTimeOut),
       m_swJScript(script),
       m_pRuntime(pRuntime),
       m_pApp(pApp) {
   CFX_SystemHandler* pHandler = m_pApp->GetSysHandler();
   m_nTimerID = pHandler->SetTimer(dwElapse, Trigger);
   (*GetGlobalTimerMap())[m_nTimerID] = this;
-  m_pRuntime->AddObserver(this);
+  SetWatchedPtr(&m_pRuntime);
 }
 
 GlobalTimer::~GlobalTimer() {
-  CJS_Runtime* pRuntime = GetRuntime();
-  if (pRuntime)
-    pRuntime->RemoveObserver(this);
-
   if (!m_nTimerID)
     return;
 
-  if (m_bValid)
+  if (GetRuntime())
     m_pApp->GetSysHandler()->KillTimer(m_nTimerID);
 
   GetGlobalTimerMap()->erase(m_nTimerID);
 }
 
 // static
 void GlobalTimer::Trigger(int nTimerID) {
   auto it = GetGlobalTimerMap()->find(nTimerID);
   if (it == GetGlobalTimerMap()->end())
     return;
@@ skipping 27 matching lines @@
   pTimer->m_pEmbedObj->CancelProc(pTimer);
 }
 
 // static
 GlobalTimer::TimerMap* GlobalTimer::GetGlobalTimerMap() {
   // Leak the timer array at shutdown.
   static auto* s_TimerMap = new TimerMap;
   return s_TimerMap;
 }
 
-void GlobalTimer::OnDestroyed() {
-  m_bValid = false;
-}
-
 BEGIN_JS_STATIC_CONST(CJS_TimerObj)
 END_JS_STATIC_CONST()
 
 BEGIN_JS_STATIC_PROP(CJS_TimerObj)
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_TimerObj)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_TimerObj, TimerObj)
@@ skipping 677 matching lines @@
 FX_BOOL app::media(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL app::execDialog(IJS_Context* cc,
                         const std::vector<CJS_Value>& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError) {
   return TRUE;
 }