diff options
| author | thestig <thestig@chromium.org> | 2016-04-14 18:29:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-14 18:29:56 -0700 |
| commit | b1a59597db4b8ce3ffc34dbfda2fb1ecb80c2397 (patch) | |
| tree | 4bef693fc2b5722a86d75ee6110da8c9d5530f6d /xfa/fxfa/include | |
| parent | b1c80fb8b843a2a345b2cd6005e591dc731355f4 (diff) | |
| download | pdfium-b1a59597db4b8ce3ffc34dbfda2fb1ecb80c2397.tar.xz | |
Simplify XFA event handling.
- Avoid casting to void*
- Don't bother firing events that no one listens for
Review URL: https://codereview.chromium.org/1890563003
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/fxfa.h | 9 | ||||
| -rw-r--r-- | xfa/fxfa/include/fxfa_widget.h | 4 | ||||
| -rw-r--r-- | xfa/fxfa/include/xfa_ffdocview.h | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h index 1f2b00b4ec..6c07370a29 100644 --- a/xfa/fxfa/include/fxfa.h +++ b/xfa/fxfa/include/fxfa.h @@ -279,10 +279,7 @@ class IXFA_AppProvider { #define XFA_PAGEVIEWEVENT_StopLayout 4 #define XFA_WIDGETEVENT_PostAdded 2 #define XFA_WIDGETEVENT_PreRemoved 3 -#define XFA_WIDGETEVENT_PostContentChanged 6 -#define XFA_WIDGETEVENT_ListItemRemoved 7 -#define XFA_WIDGETEVENT_ListItemAdded 8 -#define XFA_WIDGETEVENT_AccessChanged 9 + class IXFA_DocProvider { public: virtual ~IXFA_DocProvider() {} @@ -305,9 +302,7 @@ class IXFA_DocProvider { virtual void PageViewEvent(CXFA_FFPageView* pPageView, uint32_t dwFlags) = 0; virtual void WidgetEvent(CXFA_FFWidget* hWidget, CXFA_WidgetAcc* pWidgetData, - uint32_t dwEvent, - void* pParam = NULL, - void* pAdditional = NULL) = 0; + uint32_t dwEvent) = 0; virtual FX_BOOL RenderCustomWidget(CXFA_FFWidget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index 0f1de8526b..acd800dcd4 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -73,10 +73,6 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { void SetImageImage(CFX_DIBitmap* newImage); void SetImageEditImage(CFX_DIBitmap* newImage); void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL); - void NotifyEvent(uint32_t dwEvent, - CXFA_FFWidget* pWidget = NULL, - void* pParam = NULL, - void* pAdditional = NULL); CXFA_Node* GetDatasets(); IFX_Font* GetFDEFont(); diff --git a/xfa/fxfa/include/xfa_ffdocview.h b/xfa/fxfa/include/xfa_ffdocview.h index dc9598850a..539100116c 100644 --- a/xfa/fxfa/include/xfa_ffdocview.h +++ b/xfa/fxfa/include/xfa_ffdocview.h @@ -60,9 +60,7 @@ class CXFA_FFDocView { CXFA_WidgetAcc* GetWidgetAccByName(const CFX_WideString& wsName, CXFA_WidgetAcc* pRefWidgetAcc = nullptr); CXFA_LayoutProcessor* GetXFALayout() const; - void OnPageEvent(CXFA_ContainerLayoutItem* pSender, - XFA_PAGEEVENT eEvent, - int32_t iPageIndex); + void OnPageEvent(CXFA_ContainerLayoutItem* pSender, uint32_t dwEvent); void LockUpdate(); void UnlockUpdate(); FX_BOOL IsUpdateLocked(); |