summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-08-13 16:07:29 -0700
committerTom Sepez <tsepez@chromium.org>2015-08-13 16:07:29 -0700
commit2ebc33e549d969f6d776a59f6d313b80d7813bb1 (patch)
tree353340e4bb504b4fcdb4da0f9713db04ab01d31a /fpdfsdk/src
parente9446f85355ba5eca757b8fbb29abfc02431cbdf (diff)
downloadpdfium-2ebc33e549d969f6d776a59f6d313b80d7813bb1.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/javascript/JS_Object.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index eb089ed563..ef9bab971d 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,