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

1 files changed, 4 insertions, 4 deletions

diff --git a/xfa/fxfa/parser/xfa_layout_appadapter.cpp b/xfa/fxfa/parser/xfa_layout_appadapter.cpp
index e223ab8ce7..56ef086f82 100644
--- a/xfa/fxfa/parser/xfa_layout_appadapter.cpp
+++ b/xfa/fxfa/parser/xfa_layout_appadapter.cpp
@@ -50,15 +50,15 @@ void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem) {
   while (pNode) {
     CXFA_LayoutItem* pNext = pNode->m_pNextSibling;
     pNode->m_pParent = nullptr;
-    pNotify->OnLayoutEvent(pDocLayout, static_cast<CXFA_LayoutItem*>(pNode),
-                           XFA_LAYOUTEVENT_ItemRemoving);
+    pNotify->OnLayoutItemRemoving(pDocLayout,
+                                  static_cast<CXFA_LayoutItem*>(pNode));
     XFA_ReleaseLayoutItem(pNode);
     pNode = pNext;
   }
-  pNotify->OnLayoutEvent(pDocLayout, pLayoutItem, XFA_LAYOUTEVENT_ItemRemoving);
+  pNotify->OnLayoutItemRemoving(pDocLayout, pLayoutItem);
   if (pLayoutItem->m_pFormNode->GetClassID() == XFA_ELEMENT_PageArea) {
     pNotify->OnPageEvent(static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem),
-                         XFA_PAGEEVENT_PageRemoved);
+                         XFA_PAGEVIEWEVENT_PostRemoved);
   }
   delete pLayoutItem;
 }