Replace FWL_HLISTITEM with class IFWL_ListItem {}

Make CFWL_ classes inherit from IFWL_ListItem.
Replace reinterpret_casts with static_casts.

Review-Url: https://codereview.chromium.org/2029923002

1 files changed, 81 insertions, 83 deletions

diff --git a/xfa/fwl/lightwidget/cfwl_listbox.cpp b/xfa/fwl/lightwidget/cfwl_listbox.cpp
index e8e26f5b52..d51db44f3b 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.cpp
+++ b/xfa/fwl/lightwidget/cfwl_listbox.cpp
@@ -31,23 +31,23 @@ FWL_Error CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, FWL_HLISTITEM hItem) {
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_pDIB = pDIB;
+FWL_Error CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, IFWL_ListItem* pItem) {
+  static_cast<CFWL_ListItem*>(pItem)->m_pDIB = pDIB;
   return FWL_Error::Succeeded;
 }
 
-FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
-                                      FX_BOOL bSelect) {
+IFWL_ListItem* CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
+                                       FX_BOOL bSelect) {
   std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_dwStates = 0;
   pItem->m_wsText = wsAdd;
   pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
   m_ListBoxDP.m_ItemArray.push_back(std::move(pItem));
-  return (FWL_HLISTITEM)m_ListBoxDP.m_ItemArray.back().get();
+  return m_ListBoxDP.m_ItemArray.back().get();
 }
 
-FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem) {
-  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);
+FX_BOOL CFWL_ListBox::DeleteString(IFWL_ListItem* pItem) {
+  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), pItem);
   if (nIndex < 0 ||
       static_cast<size_t>(nIndex) >= m_ListBoxDP.m_ItemArray.size()) {
     return FALSE;
@@ -62,7 +62,7 @@ FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem) {
   }
   if (iSel >= 0) {
     CFWL_ListItem* pSel =
-        reinterpret_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, iSel));
+        static_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, iSel));
     pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;
   }
   m_ListBoxDP.m_ItemArray.erase(m_ListBoxDP.m_ItemArray.begin() + nIndex);
@@ -79,7 +79,7 @@ int32_t CFWL_ListBox::CountSelItems() {
   return static_cast<IFWL_ListBox*>(m_pIface)->CountSelItems();
 }
 
-FWL_HLISTITEM CFWL_ListBox::GetSelItem(int32_t nIndexSel) {
+IFWL_ListItem* CFWL_ListBox::GetSelItem(int32_t nIndexSel) {
   if (!m_pIface)
     return NULL;
   return static_cast<IFWL_ListBox*>(m_pIface)->GetSelItem(nIndexSel);
@@ -91,17 +91,17 @@ int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex) {
   return static_cast<IFWL_ListBox*>(m_pIface)->GetSelIndex(nIndex);
 }
 
-FWL_Error CFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+FWL_Error CFWL_ListBox::SetSelItem(IFWL_ListItem* pItem, FX_BOOL bSelect) {
   if (!m_pIface)
     return FWL_Error::Indefinite;
-  return static_cast<IFWL_ListBox*>(m_pIface)->SetSelItem(hItem, bSelect);
+  return static_cast<IFWL_ListBox*>(m_pIface)->SetSelItem(pItem, bSelect);
 }
 
-FWL_Error CFWL_ListBox::GetItemText(FWL_HLISTITEM hItem,
+FWL_Error CFWL_ListBox::GetItemText(IFWL_ListItem* pItem,
                                     CFX_WideString& wsText) {
   if (!m_pIface)
     return FWL_Error::Indefinite;
-  return static_cast<IFWL_ListBox*>(m_pIface)->GetItemText(hItem, wsText);
+  return static_cast<IFWL_ListBox*>(m_pIface)->GetItemText(pItem, wsText);
 }
 
 FWL_Error CFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
@@ -115,16 +115,16 @@ FWL_Error CFWL_ListBox::SetItemHeight(FX_FLOAT fItemHeight) {
   return FWL_Error::Succeeded;
 }
 
-FWL_HLISTITEM CFWL_ListBox::GetFocusItem() {
-  for (const auto& hItem : m_ListBoxDP.m_ItemArray) {
-    if (hItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused)
-      return (FWL_HLISTITEM)hItem.get();
+IFWL_ListItem* CFWL_ListBox::GetFocusItem() {
+  for (const auto& pItem : m_ListBoxDP.m_ItemArray) {
+    if (pItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused)
+      return pItem.get();
   }
   return nullptr;
 }
 
-FWL_Error CFWL_ListBox::SetFocusItem(FWL_HLISTITEM hItem) {
-  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);
+FWL_Error CFWL_ListBox::SetFocusItem(IFWL_ListItem* pItem) {
+  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), pItem);
   m_ListBoxDP.m_ItemArray[nIndex]->m_dwStates |= FWL_ITEMSTATE_LTB_Focused;
   return FWL_Error::Succeeded;
 }
@@ -133,43 +133,43 @@ int32_t CFWL_ListBox::CountItems() {
   return pdfium::CollectionSize<int32_t>(m_ListBoxDP.m_ItemArray);
 }
 
-FWL_HLISTITEM CFWL_ListBox::GetItem(int32_t nIndex) {
+IFWL_ListItem* CFWL_ListBox::GetItem(int32_t nIndex) {
   if (nIndex < 0 || nIndex >= CountItems())
     return nullptr;
 
-  return (FWL_HLISTITEM)m_ListBoxDP.m_ItemArray[nIndex].get();
+  return m_ListBoxDP.m_ItemArray[nIndex].get();
 }
 
-FWL_Error CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem,
+FWL_Error CFWL_ListBox::SetItemString(IFWL_ListItem* pItem,
                                       const CFX_WideStringC& wsText) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_wsText = wsText;
+  static_cast<CFWL_ListItem*>(pItem)->m_wsText = wsText;
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem,
+FWL_Error CFWL_ListBox::GetItemString(IFWL_ListItem* pItem,
                                       CFX_WideString& wsText) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  wsText = reinterpret_cast<CFWL_ListItem*>(hItem)->m_wsText;
+  wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
   return FWL_Error::Succeeded;
 }
 
-FWL_Error CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, void* pData) {
-  if (!hItem)
+FWL_Error CFWL_ListBox::SetItemData(IFWL_ListItem* pItem, void* pData) {
+  if (!pItem)
     return FWL_Error::Indefinite;
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_pData = pData;
+  static_cast<CFWL_ListItem*>(pItem)->m_pData = pData;
   return FWL_Error::Succeeded;
 }
 
-void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem) {
-  if (!hItem)
+void* CFWL_ListBox::GetItemData(IFWL_ListItem* pItem) {
+  if (!pItem)
     return NULL;
-  return reinterpret_cast<CFWL_ListItem*>(hItem)->m_pData;
+  return static_cast<CFWL_ListItem*>(pItem)->m_pData;
 }
 
-FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
+IFWL_ListItem* CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rtClient;
   m_pIface->GetClientRect(rtClient);
   fx -= rtClient.left;
@@ -180,25 +180,25 @@ FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
   static_cast<IFWL_ListBox*>(m_pIface)->GetScrollPos(fy, FALSE);
   int32_t nCount = m_ListBoxDP.CountItems(NULL);
   for (int32_t i = 0; i < nCount; i++) {
-    FWL_HLISTITEM hItem = m_ListBoxDP.GetItem(NULL, i);
-    if (!hItem) {
+    IFWL_ListItem* pItem = m_ListBoxDP.GetItem(NULL, i);
+    if (!pItem) {
       continue;
     }
     CFX_RectF rtItem;
-    m_ListBoxDP.GetItemRect(NULL, hItem, rtItem);
+    m_ListBoxDP.GetItemRect(NULL, pItem, rtItem);
     rtItem.Offset(-fPosX, -fPosY);
     if (rtItem.Contains(fx, fy)) {
-      return hItem;
+      return pItem;
     }
   }
   return NULL;
 }
 
-uint32_t CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem) {
-  if (!hItem)
+uint32_t CFWL_ListBox::GetItemStates(IFWL_ListItem* pItem) {
+  if (!pItem)
     return 0;
-  CFWL_ListItem* pItem = reinterpret_cast<CFWL_ListItem*>(hItem);
-  return pItem->m_dwStates | pItem->m_dwCheckState;
+  CFWL_ListItem* pListItem = static_cast<CFWL_ListItem*>(pItem);
+  return pListItem->m_dwStates | pListItem->m_dwCheckState;
 }
 
 CFWL_ListBox::CFWL_ListBox() {}
@@ -219,91 +219,89 @@ int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(IFWL_Widget* pWidget) {
   return pdfium::CollectionSize<int32_t>(m_ItemArray);
 }
 
-FWL_HLISTITEM CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget* pWidget,
-                                                    int32_t nIndex) {
+IFWL_ListItem* CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget* pWidget,
+                                                     int32_t nIndex) {
   if (nIndex < 0 || nIndex >= CountItems(pWidget))
     return nullptr;
 
-  return (FWL_HLISTITEM)m_ItemArray[nIndex].get();
+  return m_ItemArray[nIndex].get();
 }
 
 int32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemIndex(IFWL_Widget* pWidget,
-                                                   FWL_HLISTITEM hItem) {
+                                                   IFWL_ListItem* pItem) {
   auto it = std::find_if(
       m_ItemArray.begin(), m_ItemArray.end(),
-      [hItem](const std::unique_ptr<CFWL_ListItem>& candidate) {
-        return candidate.get() == reinterpret_cast<CFWL_ListItem*>(hItem);
+      [pItem](const std::unique_ptr<CFWL_ListItem>& candidate) {
+        return candidate.get() == static_cast<CFWL_ListItem*>(pItem);
       });
   return it != m_ItemArray.end() ? it - m_ItemArray.begin() : -1;
 }
 
 FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget* pWidget,
-                                                   FWL_HLISTITEM hItem,
+                                                   IFWL_ListItem* pItem,
                                                    int32_t nIndex) {
   if (nIndex < 0 || nIndex >= CountItems(pWidget))
     return FALSE;
-  m_ItemArray[nIndex].reset(reinterpret_cast<CFWL_ListItem*>(hItem));
+  m_ItemArray[nIndex].reset(static_cast<CFWL_ListItem*>(pItem));
   return TRUE;
 }
 
 uint32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget* pWidget,
-                                                     FWL_HLISTITEM hItem) {
-  if (!hItem)
+                                                     IFWL_ListItem* pItem) {
+  if (!pItem)
     return 0;
-  return reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwStates;
+  return static_cast<CFWL_ListItem*>(pItem)->m_dwStates;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::GetItemText(IFWL_Widget* pWidget,
-                                                    FWL_HLISTITEM hItem,
+                                                    IFWL_ListItem* pItem,
                                                     CFX_WideString& wsText) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  wsText = reinterpret_cast<CFWL_ListItem*>(hItem)->m_wsText;
+  wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::GetItemRect(IFWL_Widget* pWidget,
-                                                    FWL_HLISTITEM hItem,
+                                                    IFWL_ListItem* pItem,
                                                     CFX_RectF& rtItem) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  CFWL_ListItem* pItem = reinterpret_cast<CFWL_ListItem*>(hItem);
-  rtItem = pItem->m_rtItem;
+  rtItem = static_cast<CFWL_ListItem*>(pItem)->m_rtItem;
   return FWL_Error::Succeeded;
 }
 
 void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget* pWidget,
-                                                FWL_HLISTITEM hItem) {
-  if (!hItem)
+                                                IFWL_ListItem* pItem) {
+  if (!pItem)
     return NULL;
-  CFWL_ListItem* pItem = reinterpret_cast<CFWL_ListItem*>(hItem);
-  return pItem->m_pData;
+  return static_cast<CFWL_ListItem*>(pItem)->m_pData;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget* pWidget,
-                                                      FWL_HLISTITEM hItem,
+                                                      IFWL_ListItem* pItem,
                                                       uint32_t dwStyle) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwStates = dwStyle;
+  static_cast<CFWL_ListItem*>(pItem)->m_dwStates = dwStyle;
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget* pWidget,
-                                                    FWL_HLISTITEM hItem,
+                                                    IFWL_ListItem* pItem,
                                                     const FX_WCHAR* pszText) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_wsText = pszText;
+  static_cast<CFWL_ListItem*>(pItem)->m_wsText = pszText;
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::SetItemRect(IFWL_Widget* pWidget,
-                                                    FWL_HLISTITEM hItem,
+                                                    IFWL_ListItem* pItem,
                                                     const CFX_RectF& rtItem) {
-  if (!hItem)
+  if (!pItem)
     return FWL_Error::Indefinite;
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_rtItem = rtItem;
+  static_cast<CFWL_ListItem*>(pItem)->m_rtItem = rtItem;
   return FWL_Error::Succeeded;
 }
 
@@ -312,34 +310,34 @@ FX_FLOAT CFWL_ListBox::CFWL_ListBoxDP::GetItemHeight(IFWL_Widget* pWidget) {
 }
 
 CFX_DIBitmap* CFWL_ListBox::CFWL_ListBoxDP::GetItemIcon(IFWL_Widget* pWidget,
-                                                        FWL_HLISTITEM hItem) {
-  return reinterpret_cast<CFWL_ListItem*>(hItem)->m_pDIB;
+                                                        IFWL_ListItem* pItem) {
+  return static_cast<CFWL_ListItem*>(pItem)->m_pDIB;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckRect(IFWL_Widget* pWidget,
-                                                         FWL_HLISTITEM hItem,
+                                                         IFWL_ListItem* pItem,
                                                          CFX_RectF& rtCheck) {
-  rtCheck = reinterpret_cast<CFWL_ListItem*>(hItem)->m_rtCheckBox;
+  rtCheck = static_cast<CFWL_ListItem*>(pItem)->m_rtCheckBox;
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckRect(
     IFWL_Widget* pWidget,
-    FWL_HLISTITEM hItem,
+    IFWL_ListItem* pItem,
     const CFX_RectF& rtCheck) {
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_rtCheckBox = rtCheck;
+  static_cast<CFWL_ListItem*>(pItem)->m_rtCheckBox = rtCheck;
   return FWL_Error::Succeeded;
 }
 
 uint32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget* pWidget,
-                                                         FWL_HLISTITEM hItem) {
-  return reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState;
+                                                         IFWL_ListItem* pItem) {
+  return static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState;
 }
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(
     IFWL_Widget* pWidget,
-    FWL_HLISTITEM hItem,
+    IFWL_ListItem* pItem,
     uint32_t dwCheckState) {
-  reinterpret_cast<CFWL_ListItem*>(hItem)->m_dwCheckState = dwCheckState;
+  static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
   return FWL_Error::Succeeded;
 }