Cleanup IFWL_Adapter interfaces.

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/basewidget/ifwl_datetimepicker.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/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
-#include "xfa/fwl/core/ifwl_adapternative.h"
-#include "xfa/fwl/core/ifwl_adapterthreadmgr.h"
-#include "xfa/fwl/core/ifwl_adapterwidgetmgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_form.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fxfa/include/xfa_ffapp.h"
 
 #define FWL_CLASSHASH_Menu 3957949655
 #define FWL_STYLEEXT_MNU_Vert (1L << 0)
 
 IFWL_Widget::~IFWL_Widget() {}
 
 FWL_ERR IFWL_Widget::GetClassName(CFX_WideString& wsClass) const {
   return m_pImpl->GetClassName(wsClass);
 }
 
@@ skipping 121 matching lines @@
   return static_cast<CFWL_WidgetImp*>(GetImpl())->GetOwnerApp();
 }
 CFX_SizeF IFWL_Widget::GetOffsetFromParent(IFWL_Widget* pParent) {
   return static_cast<CFWL_WidgetImp*>(GetImpl())->GetOffsetFromParent(pParent);
 }
 
 FWL_ERR CFWL_WidgetImp::Initialize() {
   IFWL_App* pApp = FWL_GetApp();
   if (!pApp)
     return FWL_ERR_Indefinite;
-  IFWL_AdapterNative* pAdapter = pApp->GetAdapterNative();
+  CXFA_FFApp* pAdapter = pApp->GetAdapterNative();
   if (!pAdapter)
     return FWL_ERR_Indefinite;
-  IFWL_AdapterThreadMgr* pAdapterThread = pAdapter->GetThreadMgr();
-  if (!pAdapterThread)
-    return FWL_ERR_Indefinite;
-  SetOwnerApp(
-      static_cast<CFWL_AppImp*>(pAdapterThread->GetCurrentThread()->GetImpl()));
+  SetOwnerApp(static_cast<CFWL_AppImp*>(FWL_GetApp()->GetImpl()));
   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);
-      }
-    }
-    m_pWidgetMgr->CreateWidget_Native(m_pInterface);
+    IFWL_Widget* pOwner = m_pProperties->m_pOwner;
+    if (pOwner)
+      m_pWidgetMgr->SetOwner(pOwner, m_pInterface);
   }
   return FWL_ERR_Succeeded;
 }
 
 FWL_ERR CFWL_WidgetImp::Finalize() {
   NotifyDriver();
-  if (!IsChild())
-    m_pWidgetMgr->DestroyWidget_Native(m_pInterface);
-
   m_pWidgetMgr->RemoveWidget(m_pInterface);
   return FWL_ERR_Succeeded;
 }
 
 FWL_ERR CFWL_WidgetImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass.clear();
   return FWL_ERR_Succeeded;
 }
 
 uint32_t CFWL_WidgetImp::GetClassID() const {
@@ skipping 102 matching lines @@
 static void NotifyHideChildWidget(IFWL_WidgetMgr* widgetMgr,
                                   IFWL_Widget* widget,
                                   CFWL_NoteDriver* noteDriver) {
   IFWL_Widget* child = widgetMgr->GetWidget(widget, FWL_WGTRELATION_FirstChild);
   while (child) {
     noteDriver->NotifyTargetHide(child);
     NotifyHideChildWidget(widgetMgr, child, noteDriver);
     child = widgetMgr->GetWidget(child, FWL_WGTRELATION_NextSibling);
   }
 }
 FWL_ERR CFWL_WidgetImp::SetStates(uint32_t dwStates, FX_BOOL bSet) {

[Tom Sepez, 2016/04/28 16:42:12]

nit: always success?  can this be void?

[dsinclair, 2016/04/28 17:53:46]

Done.

   bSet ? (m_pProperties->m_dwStates |= dwStates)
        : (m_pProperties->m_dwStates &= ~dwStates);
-  FWL_ERR ret = FWL_ERR_Succeeded;
-  if (dwStates & FWL_WGTSTATE_Invisible) {
-    if (bSet) {
-      ret = m_pWidgetMgr->HideWidget_Native(m_pInterface);
-      CFWL_NoteDriver* noteDriver =
-          static_cast<CFWL_NoteDriver*>(GetOwnerApp()->GetNoteDriver());
-      IFWL_WidgetMgr* widgetMgr = FWL_GetWidgetMgr();
-      noteDriver->NotifyTargetHide(m_pInterface);
-      IFWL_Widget* child =
-          widgetMgr->GetWidget(m_pInterface, FWL_WGTRELATION_FirstChild);
-      while (child) {
-        noteDriver->NotifyTargetHide(child);
-        NotifyHideChildWidget(widgetMgr, child, noteDriver);
-        child = widgetMgr->GetWidget(child, FWL_WGTRELATION_NextSibling);
-      }
-    } else {
-      ret = m_pWidgetMgr->ShowWidget_Native(m_pInterface);
-    }
+  if (!(dwStates & FWL_WGTSTATE_Invisible) || !bSet)
+    return FWL_ERR_Succeeded;
+
+  CFWL_NoteDriver* noteDriver =
+      static_cast<CFWL_NoteDriver*>(GetOwnerApp()->GetNoteDriver());
+  IFWL_WidgetMgr* widgetMgr = FWL_GetWidgetMgr();
+  noteDriver->NotifyTargetHide(m_pInterface);
+  IFWL_Widget* child =
+      widgetMgr->GetWidget(m_pInterface, FWL_WGTRELATION_FirstChild);
+  while (child) {
+    noteDriver->NotifyTargetHide(child);
+    NotifyHideChildWidget(widgetMgr, child, noteDriver);
+    child = widgetMgr->GetWidget(child, FWL_WGTRELATION_NextSibling);
   }
-  return ret;
+  return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_WidgetImp::SetPrivateData(void* module_id,
                                        void* pData,
                                        PD_CALLBACK_FREEDATA callback) {
   if (!m_pPrivateData) {
     m_pPrivateData = new CFX_PrivateData;
   }
   m_pPrivateData->SetPrivateData(module_id, pData, callback);
   return FWL_ERR_Succeeded;
 }
@@ skipping 723 matching lines @@
 FWL_ERR CFWL_WidgetImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {
   return FWL_ERR_Succeeded;
 }
 
 FWL_ERR CFWL_WidgetImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
                                              const CFX_Matrix* pMatrix) {
   CFWL_EvtDraw evt;
   evt.m_pGraphics = pGraphics;
   return FWL_ERR_Succeeded;
 }