Make GlobalTimer's timer ID type consistent. [pdfium : master]
0 views
Skip to first unread message
Lei Zhang (Gerrit)
Jan 9, 2019, 6:22:02 PM1/9/19
to Lei Zhang, Tom Sepez, Chromium commit bot, pdfium-...@googlegroups.com
This change is ready for review.
To view, visit change 48031. To unsubscribe, or for help writing mail filters, visit settings.
Tom Sepez (Gerrit)
Jan 10, 2019, 12:45:58 PM1/10/19
to Lei Zhang, Chromium commit bot, pdfium-...@googlegroups.com
Patch set 1:Code-Review +1
Lei Zhang (Gerrit)
Jan 10, 2019, 2:31:08 PM1/10/19
to Lei Zhang, Tom Sepez, Chromium commit bot, pdfium-...@googlegroups.com
Patch set 1:Commit-Queue +2
Chromium commit bot (Gerrit)
Jan 10, 2019, 2:31:23 PM1/10/19
to Lei Zhang, Tom Sepez, pdfium-...@googlegroups.com
Chromium commit bot merged this change.
Approvals:
Tom Sepez: Looks good to me
Lei Zhang: Commit
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 <tse...@chromium.org>
Commit-Queue: Lei Zhang <the...@chromium.org>
---
M fxjs/global_timer.cpp
M fxjs/global_timer.h
2 files changed, 7 insertions(+), 7 deletions(-)
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;
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;
To view, visit change 48031. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages