Remove FWL globals.

This CL removes the FWL_GetApp, FWL_SetApp and FWL_GetWidgetAdapter methods.
In the process it changes the various Initialize methods to return void.

Review-Url: https://codereview.chromium.org/2436103002

1 files changed, 7 insertions, 10 deletions

diff --git a/xfa/fwl/core/ifwl_timer.cpp b/xfa/fwl/core/ifwl_timer.cpp
index 941113e7ca..3f81eec476 100644
--- a/xfa/fwl/core/ifwl_timer.cpp
+++ b/xfa/fwl/core/ifwl_timer.cpp
@@ -7,10 +7,15 @@
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_timer.h"
+#include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
 IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
-  CXFA_FFApp* pAdapterNative = FWL_GetAdapterNative();
+  const IFWL_App* pApp = m_pWidget->GetOwnerApp();
+  if (!pApp)
+    return nullptr;
+
+  CXFA_FFApp* pAdapterNative = pApp->GetAdapterNative();
   if (!pAdapterNative)
     return nullptr;
 
@@ -24,13 +29,5 @@ IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) {
 }
 
 FWL_Error IFWL_TimerInfo::StopTimer() {
-  CXFA_FFApp* pAdapterNative = FWL_GetAdapterNative();
-  if (!pAdapterNative)
-    return FWL_Error::Indefinite;
-
-  IFWL_AdapterTimerMgr* pAdapterTimerMgr = pAdapterNative->GetTimerMgr();
-  if (!pAdapterTimerMgr)
-    return FWL_Error::Indefinite;
-
-  return pAdapterTimerMgr->Stop(this);
+  return m_pMgr->Stop(this);
 }