Merge IFWL_App and FWL_AppImp together

xfa/fwl/core/fwl_widgetimp.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/fwl_widgetimp.h"
 
 #include <algorithm>
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/ifwl_combobox.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_form.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
 #define FWL_STYLEEXT_MNU_Vert (1L << 0)
 
 IFWL_Widget::IFWL_Widget() {}
@@ skipping 143 matching lines @@
 
 FWL_Error CFWL_WidgetImp::Initialize() {
   IFWL_App* pApp = FWL_GetApp();
   if (!pApp)
     return FWL_Error::Indefinite;
 
   CXFA_FFApp* pAdapter = pApp->GetAdapterNative();
   if (!pAdapter)
     return FWL_Error::Indefinite;
 
-  SetOwnerApp(static_cast<CFWL_AppImp*>(FWL_GetApp()->GetImpl()));
+  SetOwnerApp(FWL_GetApp());
 
   IFWL_Widget* pParent = m_pProperties->m_pParent;
   m_pWidgetMgr->InsertWidget(pParent, m_pInterface);
   if (!IsChild()) {
     IFWL_Widget* pOwner = m_pProperties->m_pOwner;
     if (pOwner)
       m_pWidgetMgr->SetOwner(pOwner, m_pInterface);
   }
   return FWL_Error::Succeeded;
 }
@@ skipping 292 matching lines @@
     m_pCurDelegate = m_pDelegate;
   }
   if (!pDelegate) {
     return m_pCurDelegate;
   }
   IFWL_WidgetDelegate* pOldDelegate = m_pCurDelegate;
   m_pCurDelegate = pDelegate;
   return pOldDelegate;
 }
 IFWL_App* CFWL_WidgetImp::GetOwnerApp() const {
-  return static_cast<IFWL_App*>(m_pOwnerApp->GetInterface());
+  return m_pOwnerApp;
 }
-FWL_Error CFWL_WidgetImp::SetOwnerApp(CFWL_AppImp* pOwnerApp) {
+FWL_Error CFWL_WidgetImp::SetOwnerApp(IFWL_App* pOwnerApp) {
   m_pOwnerApp = pOwnerApp;
   return FWL_Error::Succeeded;
 }
 IFWL_Widget* CFWL_WidgetImp::GetInterface() const {
   return m_pInterface;
 }
 void CFWL_WidgetImp::SetInterface(IFWL_Widget* pInterface) {
   m_pInterface = pInterface;
 }
 
@@ skipping 127 matching lines @@
   do {
     pUp = (pUp->GetStyles() & FWL_WGTSTYLE_Popup)
               ? m_pWidgetMgr->GetOwnerWidget(pUp)
               : m_pWidgetMgr->GetParentWidget(pUp);
     if (pUp) {
       IFWL_ThemeProvider* pRet = pUp->GetThemeProvider();
       if (pRet)
         return pRet;
     }
   } while (pUp);
-  return FWL_GetApp()->GetThemeProvider();

[Lei Zhang, 2016/10/18 16:48:15]

Always nullptr?

[dsinclair, 2016/10/18 17:00:22]

Yes, there were no calls to SetThemeProvider that I found, so it was always
nullptr and has been removed.

+  return nullptr;
 }
 CFWL_WidgetImp* CFWL_WidgetImp::GetRootOuter() {
   IFWL_Widget* pRet = m_pOuter;
   if (!pRet)
     return nullptr;
   while (IFWL_Widget* pOuter = pRet->GetOuter()) {
     pRet = pOuter;
   }
   return static_cast<CFWL_WidgetImp*>(pRet->GetImpl());
 }
@@ skipping 384 matching lines @@
   }
 }
 
 void CFWL_WidgetImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_WidgetImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
                                           const CFX_Matrix* pMatrix) {
   CFWL_EvtDraw evt;
   evt.m_pGraphics = pGraphics;
 }