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_Runtime_Stub.cpp | |
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_Runtime_Stub.cpp')
-rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime_Stub.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp index ea1e6c1c55..7e3d78881a 100644 --- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp @@ -15,7 +15,7 @@ class CJS_ContextStub final : public IJS_Context { // IJS_Context: FX_BOOL RunScript(const CFX_WideString& script, - CFX_WideString& info) override { + CFX_WideString* info) override { return FALSE; } @@ -146,6 +146,12 @@ class CJS_RuntimeStub final : public IJS_Runtime { return FALSE; } + int Execute(IJS_Context* cc, + const wchar_t* script, + CFX_WideString* info) override { + return 0; + } + protected: CPDFSDK_Document* m_pDoc; nonstd::unique_ptr<CJS_ContextStub> m_pContext; |