diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-11 10:07:14 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-11 10:07:14 -0800 |
| commit | 53ee50c004c7387f100edb6948c745af11b79ac9 (patch) | |
| tree | d6e152f0e1e1e87e448035e36a5158a1134ec9d4 | |
| parent | b22b251bd9ddbc85fe14ab42efa6e9dc45a6a44a (diff) | |
| download | pdfium-53ee50c004c7387f100edb6948c745af11b79ac9.tar.xz | |
Merge to M47: Make JS app.setTimeOut() work again.
This regressed in commit 794c9b6.
Also fix the build after that commit.
BUG=551248
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1424743006 .
(cherry picked from commit 8cadf995e9a0fec8da19f69edac9d10fccca7eed)
(cherry picked from commit 955930dce7e4b5c764cdd34b134baea4207de523)
Review URL: https://codereview.chromium.org/1435553006 .
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Object.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 7520a99778..38429c59f3 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -122,6 +122,7 @@ CJS_Timer::CJS_Timer(CJS_EmbedObj* pObj, m_bValid(true), m_nType(nType), m_dwTimeOut(dwTimeOut), + m_swJScript(script), m_pRuntime(pRuntime), m_pApp(pApp) { IFX_SystemHandler* pHandler = m_pApp->GetSysHandler(); |