diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-09-28 10:31:27 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-09-28 10:31:27 -0700 |
commit | bd7fabf61f41e5ac2ded12ac46a4193c3dbffc44 (patch) | |
tree | 0f4bfd65d3ca48aa2cfb16232e60ebf10991c411 /testing | |
parent | a25fd09cd880ad82aea09a7ffffe3f8e5b121bbe (diff) | |
download | pdfium-bd7fabf61f41e5ac2ded12ac46a4193c3dbffc44.tar.xz |
Merge to XFA: Introduce kPerIsolateDataIndex and tidy JS_Define.h
(cherry picked from commit d6d9dc6b9a45368abdf43477592ee9f6cdb6102e)
(cherry picked from commit cfff2f65aaec70247d020188bc68a0dc4fb34c3e)
Original Review URL: https://codereview.chromium.org/1372963003 .
Original Review URL: https://codereview.chromium.org/1367813003 .
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1370133007 .
Diffstat (limited to 'testing')
-rw-r--r-- | testing/resources/javascript/app_props_expected.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/resources/javascript/app_props_expected.txt b/testing/resources/javascript/app_props_expected.txt index 6e78ba510b..a17e0f82b5 100644 --- a/testing/resources/javascript/app_props_expected.txt +++ b/testing/resources/javascript/app_props_expected.txt @@ -1,5 +1,5 @@ Alert: *** Getting properties *** -Alert: app.activeDocs is object [object Object] +Alert: app.activeDocs is object [object global] Alert: app.calculate is boolean true Alert: app.formsVersion is number 7 Alert: ERROR: app.fs: @@ -25,7 +25,7 @@ Alert: ERROR: app.viewerType: Alert: ERROR: app.viewerVariation: Alert: ERROR: app.viewerVersion: Alert: *** Getting properties *** -Alert: app.activeDocs is object [object Object] +Alert: app.activeDocs is object [object global] Alert: app.calculate is boolean true Alert: app.formsVersion is number 7 Alert: ERROR: app.fs: |