From 55fa356c8ce72c597e75fc591fc67597b1c019d5 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Wed, 4 May 2016 14:24:53 -0700
Subject: Cleanup IFWL_Adapter interfaces.

This CL removes:
  * IFWL_AdapterNative
  * IFWL_Adapter{Widget|Thread}Mgr
  * IFWL_WidgetMgrDelegate
  * CFWL_SDAdapter{Widget|Thread}Mgr

Methods which just returned have also been removed.

Review-Url: https://codereview.chromium.org/1928963004
---
 xfa/fxfa/app/xfa_ffapp.cpp      | 12 ++----------
 xfa/fxfa/app/xfa_fffield.h      |  1 -
 xfa/fxfa/app/xfa_fwladapter.cpp |  4 ++++
 xfa/fxfa/app/xfa_fwladapter.h   | 23 +++++++++++++++--------
 4 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'xfa/fxfa/app')

diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp
index de63dc4934..7f19b26440 100644
--- a/xfa/fxfa/app/xfa_ffapp.cpp
+++ b/xfa/fxfa/app/xfa_ffapp.cpp
@@ -73,8 +73,7 @@ CXFA_FFApp::CXFA_FFApp(IXFA_AppProvider* pProvider)
 #endif
       m_pAdapterWidgetMgr(nullptr),
       m_pWidgetMgrDelegate(nullptr),
-      m_pFDEFontMgr(nullptr),
-      m_pAdapterThreadMgr(nullptr) {
+      m_pFDEFontMgr(nullptr) {
   m_pFWLApp = IFWL_App::Create(this);
   FWL_SetApp(m_pFWLApp);
   m_pFWLApp->Initialize();
@@ -90,7 +89,6 @@ CXFA_FFApp::~CXFA_FFApp() {
   if (m_pFWLTheme)
     m_pFWLTheme->Release();
   delete m_pAdapterWidgetMgr;
-  delete m_pAdapterThreadMgr;
 
   CXFA_TimeZoneProvider::Destroy();
   delete m_pFontMgr;
@@ -159,7 +157,7 @@ CXFA_FWLTheme* CXFA_FFApp::GetFWLTheme() {
   }
   return m_pFWLTheme;
 }
-IFWL_AdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr(
+CXFA_FWLAdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr(
     CFWL_WidgetMgrDelegate* pDelegate) {
   if (!m_pAdapterWidgetMgr) {
     m_pAdapterWidgetMgr = new CXFA_FWLAdapterWidgetMgr;
@@ -169,12 +167,6 @@ IFWL_AdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr(
   }
   return m_pAdapterWidgetMgr;
 }
-IFWL_AdapterThreadMgr* CXFA_FFApp::GetThreadMgr() {
-  if (!m_pAdapterThreadMgr) {
-    m_pAdapterThreadMgr = new CFWL_SDAdapterThreadMgr;
-  }
-  return m_pAdapterThreadMgr;
-}
 IFWL_AdapterTimerMgr* CXFA_FFApp::GetTimerMgr() {
   return m_pProvider->GetTimerMgr();
 }
diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h
index 576b0b105e..91908e3b98 100644
--- a/xfa/fxfa/app/xfa_fffield.h
+++ b/xfa/fxfa/app/xfa_fffield.h
@@ -7,7 +7,6 @@
 #ifndef XFA_FXFA_APP_XFA_FFFIELD_H_
 #define XFA_FXFA_APP_XFA_FFFIELD_H_
 
-#include "xfa/fwl/core/fwl_sdadapterimp.h"
 #include "xfa/fwl/core/ifwl_widgetdelegate.h"
 #include "xfa/fwl/lightwidget/cfwl_widget.h"
 #include "xfa/fxfa/include/xfa_ffpageview.h"
diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp
index 5821a729eb..564d479d73 100644
--- a/xfa/fxfa/app/xfa_fwladapter.cpp
+++ b/xfa/fxfa/app/xfa_fwladapter.cpp
@@ -9,6 +9,10 @@
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 
+CXFA_FWLAdapterWidgetMgr::CXFA_FWLAdapterWidgetMgr() {}
+
+CXFA_FWLAdapterWidgetMgr::~CXFA_FWLAdapterWidgetMgr() {}
+
 FWL_ERR CXFA_FWLAdapterWidgetMgr::RepaintWidget(IFWL_Widget* pWidget,
                                                 const CFX_RectF* pRect) {
   if (!pWidget)
diff --git a/xfa/fxfa/app/xfa_fwladapter.h b/xfa/fxfa/app/xfa_fwladapter.h
index c42ae7402b..7d2241668b 100644
--- a/xfa/fxfa/app/xfa_fwladapter.h
+++ b/xfa/fxfa/app/xfa_fwladapter.h
@@ -7,16 +7,23 @@
 #ifndef XFA_FXFA_APP_XFA_FWLADAPTER_H_
 #define XFA_FXFA_APP_XFA_FWLADAPTER_H_
 
-#include "xfa/fwl/core/fwl_sdadapterimp.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "xfa/fwl/core/fwl_error.h"
 
-class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr {
+class IFWL_Widget;
+
+class CXFA_FWLAdapterWidgetMgr {
  public:
-  virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
-  virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget,
-                              FX_FLOAT fMinHeight,
-                              FX_FLOAT fMaxHeight,
-                              const CFX_RectF& rtAnchor,
-                              CFX_RectF& rtPopup);
+  CXFA_FWLAdapterWidgetMgr();
+  ~CXFA_FWLAdapterWidgetMgr();
+
+  FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
+  FX_BOOL GetPopupPos(IFWL_Widget* pWidget,
+                      FX_FLOAT fMinHeight,
+                      FX_FLOAT fMaxHeight,
+                      const CFX_RectF& rtAnchor,
+                      CFX_RectF& rtPopup);
 };
 
 #endif  // XFA_FXFA_APP_XFA_FWLADAPTER_H_
-- 
cgit v1.2.3