summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript/JS_Object.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-07-21 13:29:55 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-21 13:29:55 -0700
commit1d3348ce0092d6d2a40de5f8433c0d0c16a1e12e (patch)
tree9d4f456e15a533fb49b2a9bdc6a38e47ad1210dc /fpdfsdk/javascript/JS_Object.cpp
parent9ca2b09126b80c03655f0eee1f02e1b2d0a18230 (diff)
downloadpdfium-1d3348ce0092d6d2a40de5f8433c0d0c16a1e12e.tar.xz
Remove EnableMessageBox() / IsMessageBoxEnabled()
It's always enabled. Also inline FXJS_MsgBox since it only has one caller. Review-Url: https://codereview.chromium.org/2167343002
Diffstat (limited to 'fpdfsdk/javascript/JS_Object.cpp')
-rw-r--r--fpdfsdk/javascript/JS_Object.cpp34
1 files changed, 10 insertions, 24 deletions
diff --git a/fpdfsdk/javascript/JS_Object.cpp b/fpdfsdk/javascript/JS_Object.cpp
index 8a4dc0fa33..b0a307beb1 100644
--- a/fpdfsdk/javascript/JS_Object.cpp
+++ b/fpdfsdk/javascript/JS_Object.cpp
@@ -10,24 +10,6 @@
#include "fpdfsdk/javascript/JS_Define.h"
#include "fpdfsdk/javascript/cjs_context.h"
-namespace {
-
-int FXJS_MsgBox(CPDFDoc_Environment* pApp,
- const FX_WCHAR* swMsg,
- const FX_WCHAR* swTitle,
- FX_UINT nType,
- FX_UINT nIcon) {
- if (!pApp)
- return 0;
-
- if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
- pDoc->KillFocusAnnot();
-
- return pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
-}
-
-} // namespace
-
CJS_EmbedObj::CJS_EmbedObj(CJS_Object* pJSObject) : m_pJSObject(pJSObject) {}
CJS_EmbedObj::~CJS_EmbedObj() {
@@ -39,7 +21,13 @@ int CJS_EmbedObj::MsgBox(CPDFDoc_Environment* pApp,
const FX_WCHAR* swTitle,
FX_UINT nType,
FX_UINT nIcon) {
- return FXJS_MsgBox(pApp, swMsg, swTitle, nType, nIcon);
+ if (!pApp)
+ return 0;
+
+ if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
+ pDoc->KillFocusAnnot();
+
+ return pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
}
void CJS_EmbedObj::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg) {
@@ -80,11 +68,9 @@ void CJS_Object::InitInstance(IJS_Runtime* pIRuntime) {}
void CJS_Object::ExitInstance() {}
void CJS_Object::Alert(CJS_Context* pContext, const FX_WCHAR* swMsg) {
- if (pContext->IsMsgBoxEnabled()) {
- CPDFDoc_Environment* pApp = pContext->GetReaderApp();
- if (pApp)
- pApp->JS_appAlert(swMsg, nullptr, 0, 3);
- }
+ CPDFDoc_Environment* pApp = pContext->GetReaderApp();
+ if (pApp)
+ pApp->JS_appAlert(swMsg, nullptr, 0, 3);
}
CJS_Timer::CJS_Timer(CJS_EmbedObj* pObj,