Simplify XFA event handling.

xfa/fxfa/app/xfa_ffnotify.h

Index: xfa/fxfa/app/xfa_ffnotify.h
diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h
index 6bf39ee6d2d60a7dc73ddbbc9847114b649614b2..d770c0c42e972f9a5fef151f263bbee6ff60b080 100644
--- a/xfa/fxfa/app/xfa_ffnotify.h
+++ b/xfa/fxfa/app/xfa_ffnotify.h
@@ -16,9 +16,7 @@ class CXFA_FFNotify {
   CXFA_FFNotify(CXFA_FFDoc* pDoc);
   ~CXFA_FFNotify();
 
-  void OnPageEvent(CXFA_ContainerLayoutItem* pSender,
-                   XFA_PAGEEVENT eEvent,
-                   void* pParam = NULL);
+  void OnPageEvent(CXFA_ContainerLayoutItem* pSender, uint32_t dwEvent);
 
   void OnNodeEvent(CXFA_Node* pSender,
                    XFA_NODEEVENT eEvent,
@@ -32,11 +30,12 @@ class CXFA_FFNotify {
                          void* pAdditional = NULL,
                          void* pAdditional2 = NULL);
   CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node* pNode);
-  void OnLayoutEvent(CXFA_LayoutProcessor* pLayout,
-                     CXFA_LayoutItem* pSender,
-                     XFA_LAYOUTEVENT eEvent,
-                     void* pParam = NULL,
-                     void* pParam2 = NULL);
+  void OnLayoutItemAdd(CXFA_LayoutProcessor* pLayout,

[Tom Sepez, 2016/04/14 22:45:44]

nit: same issue with verb tense

[Lei Zhang, 2016/04/15 01:16:40]

Already addressed from previous patch set.

+                       CXFA_LayoutItem* pSender,
+                       int32_t iPageIdx,
+                       uint32_t dwStatus);
+  void OnLayoutItemRemoving(CXFA_LayoutProcessor* pLayout,
+                            CXFA_LayoutItem* pSender);
 
   void StartFieldDrawLayout(CXFA_Node* pItem,
                             FX_FLOAT& fCalcWidth,
@@ -75,27 +74,8 @@ class CXFA_FFNotify {
                       void* pParam4);
   void OnChildAdded(CXFA_Node* pSender, void* pParam, void* pParam2);
   void OnChildRemoved(CXFA_Node* pSender, void* pParam, void* pParam2);
-  void OnLayoutItemAdd(CXFA_FFDocView* pDocView,
-                       CXFA_LayoutProcessor* pLayout,
-                       CXFA_LayoutItem* pSender,
-                       void* pParam,
-                       void* pParam2);
-  void OnLayoutItemRemoving(CXFA_FFDocView* pDocView,
-                            CXFA_LayoutProcessor* pLayout,
-                            CXFA_LayoutItem* pSender,
-                            void* pParam,
-                            void* pParam2);
-  void OnLayoutItemRectChanged(CXFA_FFDocView* pDocView,
-                               CXFA_LayoutProcessor* pLayout,
-                               CXFA_LayoutItem* pSender,
-                               void* pParam,
-                               void* pParam2);
-  void OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView,
-                                  CXFA_LayoutProcessor* pLayout,
-                                  CXFA_LayoutItem* pSender,
-                                  void* pParam,
-                                  void* pParam2);
-  CXFA_FFDoc* m_pDoc;
+
+  CXFA_FFDoc* const m_pDoc;
 };
 
 #endif  // XFA_FXFA_APP_XFA_FFNOTIFY_H_