diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-08 15:30:25 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-08 15:30:25 -0700 |
| commit | 96675b148c8961242e2e1f91a300fd9b15068bdf (patch) | |
| tree | ed35ee6fea8bce89ad5acdfab43b2332d30be885 | |
| parent | e61b6e58c9c535ca097b9819c333b65825e0c64e (diff) | |
| download | pdfium-96675b148c8961242e2e1f91a300fd9b15068bdf.tar.xz | |
Merge to XFA: Change the JS app.viewerType() return value to "pdfium"
BUG=pdfium:181
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1331633002 .
(cherry picked from commit 4bc64cabc561d5df211ed02dc75c85e41fa91312)
Review URL: https://codereview.chromium.org/1327523007 .
| -rw-r--r-- | fpdfsdk/src/javascript/app.cpp | 2 | ||||
| -rw-r--r-- | testing/resources/javascript/app_alert.in | 2 | ||||
| -rw-r--r-- | testing/resources/javascript/app_alert_expected.txt | 2 | ||||
| -rw-r--r-- | testing/resources/javascript/app_props.in | 45 | ||||
| -rw-r--r-- | testing/resources/javascript/app_props_expected.txt | 1 |
5 files changed, 49 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index 547446861f..c8815a0ca1 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -188,7 +188,7 @@ FX_BOOL app::viewerType(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) { if (vp.IsGetting()) { - vp << L"unknown"; + vp << L"pdfium"; return TRUE; } diff --git a/testing/resources/javascript/app_alert.in b/testing/resources/javascript/app_alert.in index 42f970a402..de6c8a8229 100644 --- a/testing/resources/javascript/app_alert.in +++ b/testing/resources/javascript/app_alert.in @@ -34,7 +34,7 @@ endobj {{object 11 0}} << >> stream -app.alert("This test passes if alert() logs output under the test utiltiy."); +app.alert("This test passes if alert() logs output under the test utility."); endstream endobj {{xref}} diff --git a/testing/resources/javascript/app_alert_expected.txt b/testing/resources/javascript/app_alert_expected.txt index ac46b62203..91205bc91d 100644 --- a/testing/resources/javascript/app_alert_expected.txt +++ b/testing/resources/javascript/app_alert_expected.txt @@ -1 +1 @@ -Alert: This test passes if alert() logs output under the test utiltiy. +Alert: This test passes if alert() logs output under the test utility. diff --git a/testing/resources/javascript/app_props.in b/testing/resources/javascript/app_props.in new file mode 100644 index 0000000000..fb5f9d645f --- /dev/null +++ b/testing/resources/javascript/app_props.in @@ -0,0 +1,45 @@ +{{header}} +{{object 1 0}} << + /Type /Catalog + /Pages 2 0 R + /OpenAction 10 0 R +>> +endobj +{{object 2 0}} << + /Type /Pages + /Count 1 + /Kids [ + 3 0 R + ] +>> +endobj +% Page number 0. +{{object 3 0}} << + /Type /Page + /Parent 2 0 R + /Resources << + /Font <</F1 15 0 R>> + >> + /Contents [21 0 R] + /MediaBox [0 0 612 792] +>> +% OpenAction action +{{object 10 0}} << + /Type /Action + /S /JavaScript + /JS 11 0 R +>> +endobj +% JS program to exexute +{{object 11 0}} << +>> +stream +app.alert("app.viewerType property value: " + app.viewerType); +endstream +endobj +{{xref}} +trailer << + /Root 1 0 R +>> +{{startxref}} +%%EOF diff --git a/testing/resources/javascript/app_props_expected.txt b/testing/resources/javascript/app_props_expected.txt new file mode 100644 index 0000000000..405f9c8227 --- /dev/null +++ b/testing/resources/javascript/app_props_expected.txt @@ -0,0 +1 @@ +Alert: app.viewerType property value: pdfium |