Merge to XFA: Kill JS_TIMER_MAPARRAY
(cherry picked from commit 2a0a26c94ef8131ee29ac4d466c42593cf2ff005)
Review URL: https://codereview.chromium.org/1286383004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1296493003 .
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index eb089ed..ef9bab9 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -10,10 +10,10 @@
#include "../../include/javascript/JS_Object.h"
#include "../../include/javascript/JS_Context.h"
-JS_TIMER_MAPARRAY& GetTimeMap() {
+JSTimerMap* GetGlobalTimerMap() {
// Leak the timer array at shutdown.
- static auto* timeMap = new JS_TIMER_MAPARRAY;
- return *timeMap;
+ static auto* timeMap = new JSTimerMap;
+ return timeMap;
}
int FXJS_MsgBox(CPDFDoc_Environment* pApp,