Next round of XFA changes to match master

fpdfsdk/src/pdfwindow/PWL_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 "../../include/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_EditCtrl.h"
 #include "../../include/pdfwindow/PWL_Edit.h"
@@ skipping 576 matching lines @@
   FX_BOOL bExit = FALSE;
   if (m_pFillerNotify) {
     m_pFillerNotify->OnPopupPreOpen(GetAttachedData(), bExit, nFlag);
     if (bExit)
       return FALSE;
 
     m_pFillerNotify->OnPopupPostOpen(GetAttachedData(), bExit, nFlag);
     if (bExit)
       return FALSE;
   }
-  if (m_pList->OnCharWithExit(nChar, bExit, nFlag))
-    return bExit;
-
-  return FALSE;
+  return m_pList->OnCharWithExit(nChar, bExit, nFlag) ? bExit : FALSE;
 }
 
 void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd,
                              FX_DWORD msg,
                              intptr_t wParam,
                              intptr_t lParam) {
   switch (msg) {
     case PNM_LBUTTONDOWN:
       if (pWnd == m_pButton) {
         SetPopup(!m_bPopup);
@@ skipping 34 matching lines @@
 
 void CPWL_ComboBox::SetFillerNotify(IPWL_Filler_Notify* pNotify) {
   m_pFillerNotify = pNotify;
 
   if (m_pEdit)
     m_pEdit->SetFillerNotify(pNotify);
 
   if (m_pList)
     m_pList->SetFillerNotify(pNotify);
 }