From f9fe200ca199287eb3331f32990f8c5b0cd040af Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 24 Jul 2015 09:55:39 -0700 Subject: Merge to XFA: document.delay and document.external are boolean properties. (cherry picked from commit aafeff816e22c1333c17d8a0eb4fe8927c28142d) Original Review URL: https://codereview.chromium.org/1242263010 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1244023004 . --- fpdfsdk/include/javascript/Document.h | 2 +- fpdfsdk/src/javascript/Document.cpp | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h index b3725e77af..11642366f4 100644 --- a/fpdfsdk/include/javascript/Document.h +++ b/fpdfsdk/include/javascript/Document.h @@ -183,7 +183,7 @@ private: IconTree* m_pIconTree; CPDFSDK_Document* m_pDocument; CFX_WideString m_cwBaseURL; - FX_BOOL m_bDelay; + bool m_bDelay; CFX_ArrayTemplate m_DelayData; CFX_ArrayTemplate m_DelayAnnotData; }; diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 3f55058fad..5b4ab5cda2 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -943,15 +943,10 @@ FX_BOOL Document::delay(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sE } else { - ASSERT(m_pDocument != NULL); - - if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE; - - bool b; - vp >> b; - - m_bDelay = b; + if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) +j return FALSE; + vp >> m_bDelay; if (m_bDelay) { for (int i=0,sz=m_DelayData.GetSize(); i