commit 5b166c0fe374e6e382670382224db5ec070ed479
author Lei Zhang <thestig@chromium.org> Thu Jan 10 19:31:19 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jan 10 19:31:19 2019 +0000
tree d981fef46f7bfe1a0533fc68c7bbb39f0a886768
parent d231202a51e0563cd763430fd30e0a49fe9b8531

Make GlobalTimer's timer ID type consistent.

Make it int32_t everywhere.

Change-Id: Ib59541346bc595aee0e0ac637590da852f402dde
Reviewed-on: https://pdfium-review.googlesource.com/c/48031
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fxjs/global_timer.cpp

diff --git a/fxjs/global_timer.cpp b/fxjs/global_timer.cpp
index f4d16a5..a0fac96 100644
--- a/fxjs/global_timer.cpp
+++ b/fxjs/global_timer.cpp
@@ -37,7 +37,7 @@
 }
 
 // static
-void GlobalTimer::Trigger(int nTimerID) {
+void GlobalTimer::Trigger(int32_t nTimerID) {
   auto it = GetGlobalTimerMap()->find(nTimerID);
   if (it == GetGlobalTimerMap()->end())
     return;
@@ -62,7 +62,7 @@
 }
 
 // static
-void GlobalTimer::Cancel(int nTimerID) {
+void GlobalTimer::Cancel(int32_t nTimerID) {
   auto it = GetGlobalTimerMap()->find(nTimerID);
   if (it == GetGlobalTimerMap()->end())
     return;

fxjs/global_timer.h

diff --git a/fxjs/global_timer.h b/fxjs/global_timer.h
index 0bb0d41..f8971f9 100644
--- a/fxjs/global_timer.h
+++ b/fxjs/global_timer.h
@@ -25,20 +25,20 @@
               uint32_t dwTimeOut);
   ~GlobalTimer();
 
-  static void Trigger(int nTimerID);
-  static void Cancel(int nTimerID);
+  static void Trigger(int32_t nTimerID);
+  static void Cancel(int32_t nTimerID);
 
   bool IsOneShot() const { return m_nType == 1; }
   uint32_t GetTimeOut() const { return m_dwTimeOut; }
-  int GetTimerID() const { return m_nTimerID; }
+  int32_t GetTimerID() const { return m_nTimerID; }
   CJS_Runtime* GetRuntime() const { return m_pRuntime.Get(); }
   WideString GetJScript() const { return m_swJScript; }
 
  private:
-  using TimerMap = std::map<uint32_t, GlobalTimer*>;
+  using TimerMap = std::map<int32_t, GlobalTimer*>;
   static TimerMap* GetGlobalTimerMap();
 
-  const uint32_t m_nTimerID;
+  const int32_t m_nTimerID;
   CJS_App* const m_pEmbedApp;
   bool m_bProcessing = false;