Cleanup CFWL_ThemePart data.

xfa/fwl/basewidget/fwl_listboximp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/fwl_comboboximp.h"
@@ skipping 618 matching lines @@
   uint32_t dwPartStates = CFWL_PartState_Normal;
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) {
     dwPartStates = CFWL_PartState_Disabled;
   } else if (dwItemStyles & FWL_ITEMSTATE_LTB_Selected) {
     dwPartStates = CFWL_PartState_Selected;
   }
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused &&
       dwItemStyles & FWL_ITEMSTATE_LTB_Focused) {
     dwPartStates |= CFWL_PartState_Focused;
   }
-  FWL_ListBoxItemData itemData;
-  itemData.pDataProvider = pData;
-  itemData.iIndex = Index;
   {
     CFWL_ThemeBackground param;
     param.m_pWidget = m_pInterface;
     param.m_iPart = CFWL_Part::ListItem;
     param.m_dwStates = dwPartStates;
     param.m_pGraphics = pGraphics;
     param.m_matrix.Concat(*pMatrix);
     param.m_rtPart = rtItem;
-    param.m_dwData = (uint32_t)(uintptr_t)(&itemData);

[dsinclair, 2016/05/04 16:31:01]

This strikes me as a bad idea given that itemData exists on stack.

     CFX_RectF rtFocus(rtItem);
     param.m_pData = &rtFocus;
     if (m_pVertScrollBar && !m_pHorzScrollBar &&
         (dwPartStates & CFWL_PartState_Focused)) {
       param.m_rtPart.left += 1;
       param.m_rtPart.width -= (m_fScorllBarWidth + 1);
       rtFocus.Deflate(0.5, 0.5, 1 + m_fScorllBarWidth, 1);
     }
     pTheme->DrawBackground(&param);
   }
   {
     FX_BOOL bHasIcon = GetStylesEx() & FWL_STYLEEXT_LTB_Icon;
     if (bHasIcon) {
       CFX_RectF rtDIB;
       CFX_DIBitmap* pDib = pData->GetItemIcon(m_pInterface, hItem);
       rtDIB.Set(rtItem.left, rtItem.top, rtItem.height, rtItem.height);
       if (pDib) {
         CFWL_ThemeBackground param;
         param.m_pWidget = m_pInterface;
         param.m_iPart = CFWL_Part::Icon;
         param.m_pGraphics = pGraphics;
         param.m_matrix.Concat(*pMatrix);
         param.m_rtPart = rtDIB;
-        param.m_dwData = (uint32_t)(uintptr_t)(&itemData);
         param.m_pImage = pDib;
         pTheme->DrawBackground(&param);
       }
     }
     FX_BOOL bHasCheck = GetStylesEx() & FWL_STYLEEXT_LTB_Check;
     if (bHasCheck) {
       CFX_RectF rtCheck;
       rtCheck.Set(rtItem.left, rtItem.top, rtItem.height, rtItem.height);
       rtCheck.Deflate(2, 2, 2, 2);
       pData->SetItemCheckRect(m_pInterface, hItem, rtCheck);
       CFWL_ThemeBackground param;
       param.m_pWidget = m_pInterface;
       param.m_iPart = CFWL_Part::Check;
       param.m_pGraphics = pGraphics;
       if (GetItemChecked(hItem)) {
         param.m_dwStates = CFWL_PartState_Checked;
       } else {
         param.m_dwStates = CFWL_PartState_Normal;
       }
       param.m_matrix.Concat(*pMatrix);
       param.m_rtPart = rtCheck;
-      param.m_dwData = (uint32_t)(uintptr_t)(&itemData);
       pTheme->DrawBackground(&param);
     }
     CFX_WideString wsText;
     pData->GetItemText(m_pInterface, hItem, wsText);
     if (wsText.GetLength() <= 0) {
       return;
     }
     CFX_RectF rtText(rtItem);
     rtText.Deflate(FWL_LISTBOX_ItemTextMargin, FWL_LISTBOX_ItemTextMargin);
     if (bHasIcon || bHasCheck) {
       rtText.Deflate(rtItem.height, 0, 0, 0);
     }
     CFWL_ThemeText textParam;
     textParam.m_pWidget = m_pInterface;
     textParam.m_iPart = CFWL_Part::ListItem;
     textParam.m_dwStates = dwPartStates;
     textParam.m_pGraphics = pGraphics;
     textParam.m_matrix.Concat(*pMatrix);
     textParam.m_rtPart = rtText;
     textParam.m_wsText = wsText;
     textParam.m_dwTTOStyles = m_dwTTOStyles;
     textParam.m_iTTOAlign = m_iTTOAligns;
-    textParam.m_dwData = (uint32_t)(uintptr_t)(&itemData);
     pTheme->DrawText(&textParam);
   }
 }
 CFX_SizeF CFWL_ListBoxImp::CalcSize(FX_BOOL bAutoSize) {
   CFX_SizeF fs;
   if (!m_pProperties->m_pThemeProvider)
     return fs;
 
   GetClientRect(m_rtClient);
   m_rtConent = m_rtClient;
@@ skipping 13 matching lines @@
         static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
     if (!bAutoSize) {
     }
     int32_t iCount = pData->CountItems(m_pInterface);
     for (int32_t i = 0; i < iCount; i++) {
       FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
       CFWL_ThemePart itemPart;
       itemPart.m_pWidget = m_pInterface;
       itemPart.m_iPart = CFWL_Part::ListItem;
       itemPart.m_pData = m_pProperties->m_pDataProvider;
-      itemPart.m_dwData = i;
       CFX_RectF r;
       m_pProperties->m_pThemeProvider->GetPartRect(&itemPart, r);
       if (!bAutoSize) {
         CFX_RectF rtItem;
         rtItem.Set(m_rtClient.left, m_rtClient.top + fs.y, r.width, r.height);
         IFWL_ListBoxDP* pData =
             static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
         pData->SetItemRect(m_pInterface, hItem, rtItem);
       }
       fs.y += r.height;
@@ skipping 478 matching lines @@
     pScrollBar->SetTrackPos(fPos);
     m_pOwner->Repaint(&m_pOwner->m_rtClient);
   }
   return TRUE;
 }
 void CFWL_ListBoxImpDelegate::DispatchSelChangedEv() {
   CFWL_EvtLtbSelChanged ev;
   ev.m_pSrcTarget = m_pOwner->m_pInterface;
   m_pOwner->DispatchEvent(&ev);
 }