diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-05 17:06:09 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-05 17:06:09 -0700 |
commit | d607f5b9fc4c89ea480d882de6df80e6a6338b0b (patch) | |
tree | 377b8a87dae8d69bc7b86fa57b7d415e924db061 /fpdfsdk/src/javascript/JS_Object.cpp | |
parent | 2d5a0e173f3bb8335cf302f1194305c2f9e65bed (diff) | |
download | pdfium-d607f5b9fc4c89ea480d882de6df80e6a6338b0b.tar.xz |
Merge to XFA: Remove pointless CPDFSDK_PageView usage in CJS_Object / CJS_EmbedObj.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1374723004 .
(cherry picked from commit 4942ed7a79188bd832c2a599e7dd94ea59b674ae)
Review URL: https://codereview.chromium.org/1390623003 .
Diffstat (limited to 'fpdfsdk/src/javascript/JS_Object.cpp')
-rw-r--r-- | fpdfsdk/src/javascript/JS_Object.cpp | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index a3f972c1cd..7898f48516 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -5,12 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/javascript/IJavaScript.h" +#include "../../include/javascript/JS_Context.h" #include "../../include/javascript/JS_Define.h" #include "../../include/javascript/JS_Object.h" -#include "../../include/javascript/JS_Context.h" + +namespace { int FXJS_MsgBox(CPDFDoc_Environment* pApp, - CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, @@ -24,13 +25,7 @@ int FXJS_MsgBox(CPDFDoc_Environment* pApp, return pApp->JS_appAlert(swMsg, swTitle, nType, nIcon); } -CPDFSDK_PageView* FXJS_GetPageView(IFXJS_Context* cc) { - if (CJS_Context* pContext = (CJS_Context*)cc) { - if (pContext->GetReaderDocument()) - return NULL; - } - return NULL; -} +} // namespace CJS_EmbedObj::CJS_EmbedObj(CJS_Object* pJSObject) : m_pJSObject(pJSObject) {} @@ -38,17 +33,12 @@ CJS_EmbedObj::~CJS_EmbedObj() { m_pJSObject = NULL; } -CPDFSDK_PageView* CJS_EmbedObj::JSGetPageView(IFXJS_Context* cc) { - return FXJS_GetPageView(cc); -} - int CJS_EmbedObj::MsgBox(CPDFDoc_Environment* pApp, - CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, FX_UINT nIcon) { - return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon); + return FXJS_MsgBox(pApp, swMsg, swTitle, nType, nIcon); } void CJS_EmbedObj::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg) { @@ -85,17 +75,12 @@ void CJS_Object::Dispose() { m_pV8Object.Reset(); } -CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc) { - return FXJS_GetPageView(cc); -} - int CJS_Object::MsgBox(CPDFDoc_Environment* pApp, - CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, FX_UINT nIcon) { - return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon); + return FXJS_MsgBox(pApp, swMsg, swTitle, nType, nIcon); } void CJS_Object::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg) { |