From 2ebc33e549d969f6d776a59f6d313b80d7813bb1 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 13 Aug 2015 16:07:29 -0700 Subject: 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 . --- fpdfsdk/src/javascript/JS_Object.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_Object.cpp') 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, -- cgit v1.2.3