diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-07-22 13:47:50 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-07-22 13:47:50 -0700 |
| commit | d07958fd2d1c4134d865f4ccb056eb925aaa7d2a (patch) | |
| tree | f4f24d248f3554b361f233d68847e12e5ce2dc14 /fpdfsdk/include | |
| parent | 8a0a834d2aea61fc92590839b86471ac73daa967 (diff) | |
| download | pdfium-d07958fd2d1c4134d865f4ccb056eb925aaa7d2a.tar.xz | |
Merge to XFA: Remove dead code found by Scythe.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1249643003 .
(cherry picked from commit b05f1fd710496dea44b001bb905fa1c16a39bb28)
Review URL: https://codereview.chromium.org/1250433003 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_FormFiller.h | 9 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Define.h | 6 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Runtime.h | 1 | ||||
| -rw-r--r-- | fpdfsdk/include/jsapi/fxjs_v8.h | 2 |
4 files changed, 4 insertions, 14 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index a477b34ded..215bba9a04 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: @@ -111,7 +103,6 @@ public: virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView); virtual void SaveData(CPDFSDK_PageView* pPageView); - virtual void GetKeyStrokeData(CPDFSDK_PageView* pPageView, FFL_KeyStrokeData& data); virtual FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView); CPWL_Wnd* GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew); diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 7ad7f57166..c480ce30c3 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -174,7 +174,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<szj; j++)\ @@ -203,7 +203,7 @@ int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\ const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name);\ int js_class_name::Init(IJS_Runtime* pRuntime, FXJSOBJTYPE eObjType)\ {\ - int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, NULL, NULL, 0);\ + int nObjDefnID = JS_DefineObj(pRuntime, js_class_name::m_pClassName, eObjType, NULL, NULL);\ if (nObjDefnID >=0)\ {\ for (int i=0, sz=sizeof(JS_Class_Consts)/sizeof(JSConstSpec)-1; i<sz; i++)\ @@ -344,7 +344,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)\ {\ diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h index a5c98ee0dd..20d7d63eff 100644 --- a/fpdfsdk/include/javascript/JS_Runtime.h +++ b/fpdfsdk/include/javascript/JS_Runtime.h @@ -68,7 +68,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 f5d699287d..21a6365569 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<v8::Object> obj, v8: typedef void (*LP_DESTRUCTOR)(v8::Local<v8::Object> 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); |