From d607f5b9fc4c89ea480d882de6df80e6a6338b0b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 5 Oct 2015 17:06:09 -0700 Subject: 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 . --- fpdfsdk/include/javascript/JS_Object.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'fpdfsdk/include/javascript') diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 337da7ba20..6116a83d17 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -17,7 +17,6 @@ #include "../jsapi/fxjs_v8.h" #include "JS_Runtime.h" -class CPDFSDK_PageView; class CJS_Context; class CJS_Object; class CJS_Timer; @@ -31,13 +30,11 @@ class CJS_EmbedObj { CJS_Object* GetJSObject() const { return m_pJSObject; } - CPDFSDK_PageView* JSGetPageView(IFXJS_Context* cc); int MsgBox(CPDFDoc_Environment* pApp, - CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, - const FX_WCHAR* swTitle = NULL, - FX_UINT nType = 0, - FX_UINT nIcon = 0); + const FX_WCHAR* swTitle, + FX_UINT nType, + FX_UINT nIcon); void Alert(CJS_Context* pContext, const FX_WCHAR* swMsg); protected: @@ -64,13 +61,11 @@ class CJS_Object { void SetEmbedObject(CJS_EmbedObj* pObj) { m_pEmbedObj.reset(pObj); } CJS_EmbedObj* GetEmbedObject() const { return m_pEmbedObj.get(); } - static CPDFSDK_PageView* JSGetPageView(IFXJS_Context* cc); static int MsgBox(CPDFDoc_Environment* pApp, - CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, - const FX_WCHAR* swTitle = NULL, - FX_UINT nType = 0, - FX_UINT nIcon = 0); + const FX_WCHAR* swTitle, + FX_UINT nType, + FX_UINT nIcon); static void Alert(CJS_Context* pContext, const FX_WCHAR* swMsg); v8::Isolate* GetIsolate() { return m_pIsolate; } -- cgit v1.2.3