diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:00:10 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:00:10 -0700 |
| commit | 3342090d65e852f3f37a8f04d3fbe3ff2467d05c (patch) | |
| tree | 04ea6a1adeae79279a4d4e0f147161c2b4601dcb /fpdfsdk/src/javascript/JS_Object.h | |
| parent | f6c67325ebb931ecad6c0f0e90302d854db75900 (diff) | |
| download | pdfium-3342090d65e852f3f37a8f04d3fbe3ff2467d05c.tar.xz | |
Merge to XFA: Pass IJS_Runtime, not IJS_Context, to native object constructors.
Original Review URL: https://codereview.chromium.org/1389163007 .
(cherry picked from commit 848a13b6777cbff8cc4aea3ab3d69eaa0b82ae6c)
Merge conflics in:
fpdfsdk/src/javascript/JS_Runtime.cpp
fpdfsdk/src/javascript/JS_Runtime_Stub.cpp
fpdfsdk/src/jsapi/fxjs_v8.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1394993006 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_Object.h')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index 563a316bd6..50751523f5 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -49,8 +49,8 @@ class CJS_Object { virtual FX_BOOL IsType(const FX_CHAR* sClassName) { return TRUE; } virtual CFX_ByteString GetClassName() { return ""; } - virtual FX_BOOL InitInstance(IJS_Context* cc) { return TRUE; } - virtual FX_BOOL ExitInstance() { return TRUE; } + virtual void InitInstance(IJS_Runtime* pIRuntime) {} + virtual void ExitInstance() {} v8::Local<v8::Object> ToV8Object() { return m_pV8Object.Get(m_pIsolate); } |