Remove FWL globals.

xfa/fwl/core/ifwl_combolist.cpp

 // Copyright 2016 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/ifwl_combolist.h"
 
 #include "xfa/fwl/core/ifwl_combobox.h"
 #include "xfa/fwl/core/ifwl_comboedit.h"
 
-IFWL_ComboList::IFWL_ComboList(const CFWL_WidgetImpProperties& properties,
+IFWL_ComboList::IFWL_ComboList(const IFWL_App* app,
+                               const CFWL_WidgetImpProperties& properties,
                                IFWL_Widget* pOuter)
-    : IFWL_ListBox(properties, pOuter), m_bNotifyOwner(TRUE) {
+    : IFWL_ListBox(app, properties, pOuter), m_bNotifyOwner(TRUE) {
   ASSERT(pOuter);
 }
 
-FWL_Error IFWL_ComboList::Initialize() {
-  if (IFWL_ListBox::Initialize() != FWL_Error::Succeeded)
-    return FWL_Error::Indefinite;
+void IFWL_ComboList::Initialize() {
+  IFWL_ListBox::Initialize();
+
+  // Delete the delegate that was created by IFWL_ListBox::Initialize ...
   delete m_pDelegate;
   m_pDelegate = new CFWL_ComboListImpDelegate(this);

[Tom Sepez, 2016/10/28 23:11:47]

nit: maybe m_pDelegate should be unique_ptr.  Also it seems wrong for the
subclass to be manipulating the superclass instance variables rather than
calling a SetDelegate() method in the superclass.

[dsinclair, 2016/10/31 14:13:18]

Ack. I'm working on that, will be in a follow up CL. I think we need to pass it
down the constructors as it does some weird stuff currently.

-  return FWL_Error::Succeeded;
 }
 
 void IFWL_ComboList::Finalize() {
   delete m_pDelegate;
   m_pDelegate = nullptr;

[Tom Sepez, 2016/10/28 23:11:47]

nit. e.g. SetDelegate(nullptr);

[dsinclair, 2016/10/31 14:13:18]

Acknowledged.

   IFWL_ListBox::Finalize();
 }
 
 int32_t IFWL_ComboList::MatchItem(const CFX_WideString& wsMatch) {
   if (wsMatch.IsEmpty()) {
     return -1;
   }
   if (!m_pProperties->m_pDataProvider)
     return -1;
   IFWL_ListBoxDP* pData =
@@ skipping 243 matching lines @@
       CFX_RectF rtInvalidate;
       rtInvalidate.Set(0, 0, m_pOwner->m_pProperties->m_rtWidget.width,
                        m_pOwner->m_pProperties->m_rtWidget.height);
       m_pOwner->Repaint(&rtInvalidate);
       break;
     }
     default:
       break;
   }
 }