Cleaning up nits in fwl/core files.

xfa/fwl/core/cfwl_combobox.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/core/cfwl_combobox.h"
 
 #include <utility>
 
@@ skipping 29 matching lines @@
 
 int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) {
   std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_wsText = wsText;
   pItem->m_dwStyles = 0;
   m_ItemArray.push_back(std::move(pItem));
   return m_ItemArray.size() - 1;
 }
 
 bool CFWL_ComboBox::RemoveAt(int32_t iIndex) {
-  if (iIndex < 0 || static_cast<size_t>(iIndex) >= m_ItemArray.size()) {
+  if (iIndex < 0 || static_cast<size_t>(iIndex) >= m_ItemArray.size())
     return false;
-  }
+
   m_ItemArray.erase(m_ItemArray.begin() + iIndex);
   return true;
 }
 
 void CFWL_ComboBox::RemoveAll() {
   m_ItemArray.clear();
 }
 
 void CFWL_ComboBox::GetTextByIndex(int32_t iIndex,

[npm, 2016/11/15 21:38:30]

Is this the point where you change the Get methods to return? :)

[dsinclair, 2016/11/15 21:44:06]

After I merge the classes.

                                    CFX_WideString& wsText) const {
   CFWL_ListItem* pItem =
       static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iIndex));
   if (pItem)
     wsText = pItem->m_wsText;
 }
 
 int32_t CFWL_ComboBox::GetCurSel() const {
   return GetWidget() ? ToComboBox(GetWidget())->GetCurSel() : -1;
 }
@@ skipping 88 matching lines @@
                                CFX_WideString& wsCaption) {}
 
 int32_t CFWL_ComboBox::CountItems(const IFWL_Widget* pWidget) const {
   return m_ItemArray.size();
 }
 
 CFWL_ListItem* CFWL_ComboBox::GetItem(const IFWL_Widget* pWidget,
                                       int32_t nIndex) const {
   if (nIndex < 0 || static_cast<size_t>(nIndex) >= m_ItemArray.size())
     return nullptr;
-
   return m_ItemArray[nIndex].get();
 }
 
 int32_t CFWL_ComboBox::GetItemIndex(IFWL_Widget* pWidget,
                                     CFWL_ListItem* pItem) {
   auto it = std::find_if(
       m_ItemArray.begin(), m_ItemArray.end(),
       [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;
 }
 
 uint32_t CFWL_ComboBox::GetItemStyles(IFWL_Widget* pWidget,

[npm, 2016/11/15 21:38:30]

Is this some inherited method, or can you remove pWidget? Similarly
in several more methods in this class.

[dsinclair, 2016/11/15 21:44:06]

They're inherited from the DataProvider override. It's possible it could be
removed but I'd have to go through all the things that use that provider. I'll
add it to my list of things to do after the merge.

                                       CFWL_ListItem* pItem) {
-  if (!pItem)
-    return 0;
-  return static_cast<CFWL_ListItem*>(pItem)->m_dwStyles;
+  return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_dwStyles : 0;
 }
 
 void CFWL_ComboBox::GetItemText(IFWL_Widget* pWidget,
                                 CFWL_ListItem* pItem,
                                 CFX_WideString& wsText) {
   if (pItem)
     wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText;
 }
 
 void CFWL_ComboBox::GetItemRect(IFWL_Widget* pWidget,
                                 CFWL_ListItem* pItem,
                                 CFX_RectF& rtItem) {
   if (!pItem)
     return;
+
   CFWL_ListItem* pComboItem = static_cast<CFWL_ListItem*>(pItem);
   rtItem.Set(pComboItem->m_rtItem.left, pComboItem->m_rtItem.top,
              pComboItem->m_rtItem.width, pComboItem->m_rtItem.height);
 }
 
 void* CFWL_ComboBox::GetItemData(IFWL_Widget* pWidget, CFWL_ListItem* pItem) {
   return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_pData : nullptr;
 }
 
 void CFWL_ComboBox::SetItemStyles(IFWL_Widget* pWidget,
@@ skipping 34 matching lines @@
 
 void CFWL_ComboBox::SetItemCheckState(IFWL_Widget* pWidget,
                                       CFWL_ListItem* pItem,
                                       uint32_t dwCheckState) {
   static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
 }
 
 FX_FLOAT CFWL_ComboBox::GetListHeight(IFWL_Widget* pWidget) {
   return m_fMaxListHeight;
 }