commit f743552fbdb17f974c9b1675af81210fe0ffcc50
author Dan Sinclair <dsinclair@chromium.org> Mon Feb 05 22:27:22 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Feb 05 22:27:22 2018 +0000
tree d0eccefff3c758151428e18eb803e93d8864046a
parent 998fee395fc8a543968c7db3db9e3cf81dee57fc

Fold CJS_EmbedObj classes into CJS_Object classes

This CL removes the CJS_EmbedObj class and various subclasses and folds
the subclasses into their CJS_Object counterparts.

Change-Id: If6b882a4995c0b1bf83ac783f5c27ba9216c2d5c
Reviewed-on: https://pdfium-review.googlesource.com/25410
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fxjs/global_timer.cpp

diff --git a/fxjs/global_timer.cpp b/fxjs/global_timer.cpp
index 6f7f09c..9c69ac2 100644
--- a/fxjs/global_timer.cpp
+++ b/fxjs/global_timer.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/global_timer.h"
 
-GlobalTimer::GlobalTimer(app* pObj,
+GlobalTimer::GlobalTimer(CJS_App* pObj,
                          CPDFSDK_FormFillEnvironment* pFormFillEnv,
                          CJS_Runtime* pRuntime,
                          int nType,
@@ -14,7 +14,7 @@
                          uint32_t dwElapse,
                          uint32_t dwTimeOut)
     : m_nTimerID(0),
-      m_pEmbedObj(pObj),
+      m_pEmbedApp(pObj),
       m_bProcessing(false),
       m_nType(nType),
       m_dwTimeOut(dwTimeOut),
@@ -48,8 +48,8 @@
     return;
 
   pTimer->m_bProcessing = true;
-  if (pTimer->m_pEmbedObj)
-    pTimer->m_pEmbedObj->TimerProc(pTimer);
+  if (pTimer->m_pEmbedApp)
+    pTimer->m_pEmbedApp->TimerProc(pTimer);
 
   // Timer proc may have destroyed timer, find it again.
   it = GetGlobalTimerMap()->find(nTimerID);
@@ -59,7 +59,7 @@
   pTimer = it->second;
   pTimer->m_bProcessing = false;
   if (pTimer->IsOneShot())
-    pTimer->m_pEmbedObj->CancelProc(pTimer);
+    pTimer->m_pEmbedApp->CancelProc(pTimer);
 }
 
 // static
@@ -69,7 +69,7 @@
     return;
 
   GlobalTimer* pTimer = it->second;
-  pTimer->m_pEmbedObj->CancelProc(pTimer);
+  pTimer->m_pEmbedApp->CancelProc(pTimer);
 }
 
 // static