diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-24 09:55:39 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-24 09:55:39 -0700 |
| commit | f9fe200ca199287eb3331f32990f8c5b0cd040af (patch) | |
| tree | 7fa9c8e4a2098b6025a6ff374c1de2dd7ff91ad9 | |
| parent | 1f3442ce5c035d22e2cc9fffc203892f2f749373 (diff) | |
| download | pdfium-f9fe200ca199287eb3331f32990f8c5b0cd040af.tar.xz | |
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 .
| -rw-r--r-- | fpdfsdk/include/javascript/Document.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 13 | ||||
| -rw-r--r-- | testing/resources/javascript/document_props_expected.txt | 8 |
3 files changed, 9 insertions, 14 deletions
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<CJS_DelayData*> m_DelayData; CFX_ArrayTemplate<CJS_AnnotObj*> 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<sz; i++) @@ -1109,7 +1104,7 @@ FX_BOOL Document::external(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& { //In Chrome case,should always return true. if (vp.IsGetting()) { - vp << TRUE; + vp << true; } return TRUE; } diff --git a/testing/resources/javascript/document_props_expected.txt b/testing/resources/javascript/document_props_expected.txt index 728d2455e1..4b60a624da 100644 --- a/testing/resources/javascript/document_props_expected.txt +++ b/testing/resources/javascript/document_props_expected.txt @@ -7,10 +7,10 @@ Alert: this.calculate is boolean true Alert: this.Collab is undefined undefined Alert: this.creationDate is string Alert: this.creator is string Joe Random Creator -Alert: this.delay is number 0 +Alert: this.delay is boolean false Alert: this.dirty is boolean false Alert: this.documentFileName is string -Alert: this.external is number 1 +Alert: this.external is boolean true Alert: this.filesize is number 0 Alert: this.icons is undefined undefined Alert: this.info is object [object Object] @@ -72,10 +72,10 @@ Alert: this.calculate is boolean true Alert: this.Collab is undefined undefined Alert: this.creationDate is string 3 Alert: this.creator is string 3 -Alert: this.delay is number 1 +Alert: this.delay is boolean true Alert: this.dirty is boolean true Alert: this.documentFileName is string -Alert: this.external is number 1 +Alert: this.external is boolean true Alert: this.filesize is number 0 Alert: this.icons is undefined undefined Alert: this.info is object [object Object] |