diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-11 08:35:03 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-11 08:35:03 -0700 |
| commit | 570875c067ab1b4c81fac2cfe908f867d3979d3a (patch) | |
| tree | 0f238dc0696073dbb2899e593879861b814fd408 /fpdfsdk/include/javascript/Consts.h | |
| parent | 87d76b5453e9de46dc0469fe3597eae7d888c411 (diff) | |
| download | pdfium-570875c067ab1b4c81fac2cfe908f867d3979d3a.tar.xz | |
Merge to XFA: Rename Init methods to more accurately describe purpose
(cherry picked from commit df4de98c06075b0e491ac645f2d118a6813cedc9)
Trivial manual merges in
fpdfsdk/include/javascript/JS_Runtime.h
fpdfsdk/src/javascript/JS_Runtime.cpp
Original Review URL: https://codereview.chromium.org/1335763002 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1334313002 .
Diffstat (limited to 'fpdfsdk/include/javascript/Consts.h')
| -rw-r--r-- | fpdfsdk/include/javascript/Consts.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h index 165001784b..778e2216f4 100644 --- a/fpdfsdk/include/javascript/Consts.h +++ b/fpdfsdk/include/javascript/Consts.h @@ -103,14 +103,14 @@ class CJS_Zoomtype : public CJS_Object { class CJS_GlobalConsts : public CJS_Object { public: - static int Init(v8::Isolate* pIsolate); + static int DefineJSObjects(v8::Isolate* pIsolate); }; /* ------------------------------ CJS_GlobalArrays -------------------------- */ class CJS_GlobalArrays : public CJS_Object { public: - static int Init(v8::Isolate* pIsolate); + static int DefineJSObjects(v8::Isolate* pIsolate); }; #endif // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_ |