From b05f1fd710496dea44b001bb905fa1c16a39bb28 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 22 Jul 2015 13:33:43 -0700 Subject: Remove dead code found by Scythe. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1249643003 . --- fpdfsdk/include/formfiller/FFL_FormFiller.h | 10 ---------- fpdfsdk/include/javascript/JS_Define.h | 6 +++--- fpdfsdk/include/javascript/JS_Runtime.h | 1 - fpdfsdk/include/jsapi/fxjs_v8.h | 2 +- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 4 ---- fpdfsdk/src/javascript/JS_Runtime.cpp | 1 - fpdfsdk/src/jsapi/fxjs_v8.cpp | 9 ++++----- 7 files changed, 8 insertions(+), 25 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index c597d1e41f..fc858a8822 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -18,14 +18,6 @@ class CPDFSDK_PageView; class CPDFSDK_Document; class CPDFSDK_Widget; -struct FFL_KeyStrokeData -{ - CFX_WideString swValue; - FX_BOOL bFull; - int nSelStart; - int nSelEnd; -}; - class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { public: @@ -107,8 +99,6 @@ public: virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView); virtual void SaveData(CPDFSDK_PageView* pPageView); - virtual void GetKeyStrokeData(CPDFSDK_PageView* pPageView, FFL_KeyStrokeData& data); - CPWL_Wnd* GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew); void DestroyPDFWindow(CPDFSDK_PageView* pPageView); void EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow); diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index dabcb0645a..f1b36bf3d0 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -183,7 +183,7 @@ void js_class_name::JSDestructor(JSFXObject obj) \ \ int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\ {\ - int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, JSConstructor, JSDestructor, 0);\ + int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, JSConstructor, JSDestructor);\ if (nObjDefnID >= 0)\ {\ for (int j=0, szj=sizeof(JS_Class_Properties)/sizeof(JSPropertySpec)-1; j=0)\ {\ for (int i=0, sz=sizeof(JS_Class_Consts)/sizeof(JSConstSpec)-1; i= 0)\ {\ diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h index f08f4a30b8..8fdfa8b733 100644 --- a/fpdfsdk/include/javascript/JS_Runtime.h +++ b/fpdfsdk/include/javascript/JS_Runtime.h @@ -64,7 +64,6 @@ protected: CPDFDoc_Environment* m_pApp; CPDFSDK_Document* m_pDocument; FX_BOOL m_bBlocking; - FX_BOOL m_bRegistered; CJS_FieldEvent* m_pFieldEventPath; v8::Isolate* m_isolate; diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index b4dac71561..e291898701 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -53,7 +53,7 @@ typedef void (*LP_CONSTRUCTOR)(IFXJS_Context* cc, v8::Local obj, v8: typedef void (*LP_DESTRUCTOR)(v8::Local obj); -int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew); +int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor); int JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall); int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut); int JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel); diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index c6cae08781..1811cb0424 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -605,10 +605,6 @@ void CFFL_FormFiller::SaveData(CPDFSDK_PageView* pPageView) { } -void CFFL_FormFiller::GetKeyStrokeData(CPDFSDK_PageView* pPageView, FFL_KeyStrokeData& data) -{ -} - void CFFL_FormFiller::SetChangeMark() { m_pApp->FFI_OnChange(); diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 2343eb3a43..34a451b0ee 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -112,7 +112,6 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) : m_pApp(pApp), m_pDocument(NULL), m_bBlocking(FALSE), - m_bRegistered(FALSE), m_pFieldEventPath(NULL), m_isolate(NULL) { diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index feed779f17..c4811bf096 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -41,8 +41,8 @@ public: class CJS_ObjDefintion { public: - CJS_ObjDefintion(v8::Isolate* isolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew): - objName(sObjName), objType(eObjType), m_pConstructor(pConstructor), m_pDestructor(pDestructor),m_bApplyNew(bApplyNew),m_bSetAsGlobalObject(FALSE) + CJS_ObjDefintion(v8::Isolate* isolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor): + objName(sObjName), objType(eObjType), m_pConstructor(pConstructor), m_pDestructor(pDestructor),m_bSetAsGlobalObject(FALSE) { v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); @@ -68,14 +68,13 @@ public: FXJSOBJTYPE objType; LP_CONSTRUCTOR m_pConstructor; LP_DESTRUCTOR m_pDestructor; - unsigned m_bApplyNew; FX_BOOL m_bSetAsGlobalObject; v8::Global m_objTemplate; v8::Global m_StaticObj; }; -int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew) +int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor) { v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; v8::Isolate::Scope isolate_scope(isolate); @@ -86,7 +85,7 @@ int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE e pArray = new CFX_PtrArray(); isolate->SetData(g_embedderDataSlot, pArray); } - CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion(isolate, sObjName, eObjType, pConstructor, pDestructor, bApplyNew); + CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion(isolate, sObjName, eObjType, pConstructor, pDestructor); pArray->Add(pObjDef); return pArray->GetSize()-1; } -- cgit v1.2.3