From bd7fabf61f41e5ac2ded12ac46a4193c3dbffc44 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 28 Sep 2015 10:31:27 -0700 Subject: 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 . --- testing/resources/javascript/app_props_expected.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing/resources') 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: -- cgit v1.2.3