Simplify XFA event handling.

xfa/fxfa/app/xfa_ffnotify.cpp

Index: xfa/fxfa/app/xfa_ffnotify.cpp
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp
index ac4cc27f8d4672465a1fde85bba61665091d2eef..31e68b77f51fb6347c1247c0411686577b8cb5d0 100644
--- a/xfa/fxfa/app/xfa_ffnotify.cpp
+++ b/xfa/fxfa/app/xfa_ffnotify.cpp
@@ -88,8 +88,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
       if (!pWidget) {
         if (bStaticNotify) {
           pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
-              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded, pParam,
-              pAdditional);
+              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded);
         }
         return;
       }
@@ -107,8 +106,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
         }
         if (bStaticNotify) {
           pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
-              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded, pParam,
-              pAdditional);
+              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemAdded);
         }
         pWidget = pWidgetAcc->GetNextWidget(pWidget);
       }
@@ -122,8 +120,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
       if (!pWidget) {
         if (bStaticNotify) {
           pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
-              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved, pParam,
-              pAdditional);
+              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved);
         }
         return;
       }
@@ -139,8 +136,7 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
         }
         if (bStaticNotify) {
           pWidgetAcc->GetDoc()->GetDocProvider()->WidgetEvent(
-              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved, pParam,
-              pAdditional);
+              pWidget, pWidgetAcc, XFA_WIDGETEVENT_ListItemRemoved);
         }
         pWidget = pWidgetAcc->GetNextWidget(pWidget);
       }
@@ -247,13 +243,7 @@ void CXFA_FFNotify::OnLayoutEvent(CXFA_LayoutProcessor* pLayout,
       OnLayoutItemAdd(pDocView, pLayout, pSender, pParam, pParam2);
       break;
     case XFA_LAYOUTEVENT_ItemRemoving:
-      OnLayoutItemRemoving(pDocView, pLayout, pSender, pParam, pParam2);
-      break;
-    case XFA_LAYOUTEVENT_RectChanged:
-      OnLayoutItemRectChanged(pDocView, pLayout, pSender, pParam, pParam2);
-      break;
-    case XFA_LAYOUTEVENT_StatusChanged:
-      OnLayoutItemStatustChanged(pDocView, pLayout, pSender, pParam, pParam2);
+      OnLayoutItemRemoving(pDocView, pLayout, pSender);
       break;
   }
 }
@@ -494,18 +484,12 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
       default:
         break;
     }
-    if (bIsContainerNode && eAttr == XFA_ATTRIBUTE_Access) {
+    if (bIsContainerNode && eAttr == XFA_ATTRIBUTE_Access)
       bUpdateProperty = TRUE;
-      FX_BOOL bNotify = pDocView->IsStaticNotify();
-      if (bNotify) {
-        pWidgetAcc->NotifyEvent(XFA_WIDGETEVENT_AccessChanged, NULL, pParam2,
-                                NULL);
-      }
-    }
+
     if (eAttr == XFA_ATTRIBUTE_Value) {
       pDocView->AddCalculateNodeNotify(pSender);
       if (ePType == XFA_ELEMENT_Value || bIsContainerNode) {
-        FX_BOOL bNotify = pDocView->IsStaticNotify();
         if (bIsContainerNode) {
           pWidgetAcc->UpdateUIDisplay();
           pDocView->AddCalculateWidgetAcc(pWidgetAcc);
@@ -514,10 +498,6 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
                        ->GetClassID() == XFA_ELEMENT_ExclGroup) {
           pWidgetAcc->UpdateUIDisplay();
         }
-        if (bNotify) {
-          pWidgetAcc->NotifyEvent(XFA_WIDGETEVENT_PostContentChanged, NULL,
-                                  NULL, NULL);
-        }
         return;
       }
     }
@@ -585,8 +565,7 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
           (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) {
     pWidget->SetPageView(pNewPageView);
     m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
-                                          XFA_WIDGETEVENT_PostAdded,
-                                          pNewPageView, pPrePageView);
+                                          XFA_WIDGETEVENT_PostAdded);
   }
   if (pDocView->GetLayoutStatus() != XFA_DOCVIEW_LAYOUTSTATUS_End ||
       !(dwStatus & XFA_WIDGETSTATUS_Visible)) {
@@ -604,45 +583,10 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
 }
 void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView,
                                          CXFA_LayoutProcessor* pLayout,
-                                         CXFA_LayoutItem* pSender,
-                                         void* pParam,
-                                         void* pParam2) {
+                                         CXFA_LayoutItem* pSender) {
   CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
   pDocView->DeleteLayoutItem(pWidget);
   m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
-                                        XFA_WIDGETEVENT_PreRemoved, nullptr,
-                                        pWidget->GetPageView());
+                                        XFA_WIDGETEVENT_PreRemoved);
   pWidget->AddInvalidateRect(nullptr);
 }
-void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView,
-                                            CXFA_LayoutProcessor* pLayout,
-                                            CXFA_LayoutItem* pSender,
-                                            void* pParam,
-                                            void* pParam2) {}
-void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView,
-                                               CXFA_LayoutProcessor* pLayout,
-                                               CXFA_LayoutItem* pSender,
-                                               void* pParam,
-                                               void* pParam2) {
-  CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
-  if (!pWidget) {
-    return;
-  }
-  uint32_t dwStatus = (uint32_t)(uintptr_t)pParam;
-  if (dwStatus == 0) {
-    CXFA_LayoutItem* pPreItem = pSender->GetPrev();
-    if (pPreItem) {
-      CXFA_FFWidget* pPreWidget = static_cast<CXFA_FFWidget*>(pPreItem);
-      if (pPreWidget) {
-        dwStatus = pPreWidget->GetStatus();
-      }
-    }
-  }
-  uint32_t dwOldStatus = pWidget->GetStatus();
-  uint32_t dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
-                      XFA_WIDGETSTATUS_Printable;
-  if ((dwOldStatus & dwFilter) == dwStatus) {
-    return;
-  }
-  pWidget->ModifyStatus(dwStatus, dwFilter);
-}