diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-03-02 12:59:05 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-03-02 12:59:05 -0800 |
commit | 3a83266acee37e99832adaf1337c6b3ab7559f50 (patch) | |
tree | 8700b04028864100e2618a72e4a9f52a6bc2f224 /fpdfsdk/src/javascript/console.cpp | |
parent | fb3eea5323bf59884659510a6743037cc1d546cd (diff) | |
download | pdfium-3a83266acee37e99832adaf1337c6b3ab7559f50.tar.xz |
Merge to XFA: Return error information from pdfium to JS.
Cherry-pick from b720d0a14601f1496ef15297bc46d401f5a2a890 +
Manually resolve merge conflicts +
Fix more IWYU to fix compile.
Original Review URL: https://codereview.chromium.org/963193003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/971013002
Diffstat (limited to 'fpdfsdk/src/javascript/console.cpp')
-rw-r--r-- | fpdfsdk/src/javascript/console.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index d79ac3405d..e8a2c4c4a0 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -10,9 +10,7 @@ #include "../../include/javascript/JS_Object.h" #include "../../include/javascript/JS_Value.h" #include "../../include/javascript/console.h" -//#include "../../include/javascript/JS_Module.h" #include "../../include/javascript/JS_EventHandler.h" -//#include "../../include/javascript/JS_ResMgr.h" #include "../../include/javascript/JS_Context.h" /* ------------------------ console ------------------------ */ |