| commit | 79e893a1d0f2083f17c40ccadf2cc1250aad5a14 | [log] [tgz] |
|---|---|---|
| author | Lei Zhang <thestig@chromium.org> | Wed Nov 04 16:02:47 2015 -0800 |
| committer | Lei Zhang <thestig@chromium.org> | Wed Nov 04 16:02:47 2015 -0800 |
| tree | 114028fbcc6ba016620cba2981a512bea83128d5 | |
| parent | 8fec3e42ed57a988ad5e7faae5e6a83847a3267e [diff] [blame] |
Merge to XFA: Make JS app.setTimeOut() work again. This regressed in commit 794c9b6. BUG=551248 TBR=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/1416663008 .
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 0556c4e..883ecc8 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -108,6 +108,7 @@ m_bValid(true), m_nType(nType), m_dwTimeOut(dwTimeOut), + m_swJScript(script), m_pRuntime(pRuntime), m_pApp(pApp) { IFX_SystemHandler* pHandler = m_pApp->GetSysHandler();