From 20855384b8149a631c3c1d229551523c12eb767b Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Mon, 31 Oct 2016 07:29:34 -0700
Subject: 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
---
 xfa/fwl/core/cfwl_edit.cpp | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'xfa/fwl/core/cfwl_edit.cpp')

diff --git a/xfa/fwl/core/cfwl_edit.cpp b/xfa/fwl/core/cfwl_edit.cpp
index 9e106929bb..d0936a65b7 100644
--- a/xfa/fwl/core/cfwl_edit.cpp
+++ b/xfa/fwl/core/cfwl_edit.cpp
@@ -9,6 +9,24 @@
 #include <memory>
 #include <vector>
 
+CFWL_Edit::CFWL_Edit(const IFWL_App* app) : CFWL_Widget(app) {}
+
+CFWL_Edit::~CFWL_Edit() {}
+
+void CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {
+  ASSERT(!m_pIface);
+
+  if (pProperties)
+    *m_pProperties = *pProperties;
+
+  std::unique_ptr<IFWL_Edit> pEdit(new IFWL_Edit(
+      m_pApp, m_pProperties->MakeWidgetImpProperties(nullptr), nullptr));
+  pEdit->Initialize();
+
+  m_pIface = std::move(pEdit);
+  CFWL_Widget::Initialize(pProperties);
+}
+
 IFWL_Edit* CFWL_Edit::GetWidget() {
   return static_cast<IFWL_Edit*>(m_pIface.get());
 }
@@ -17,23 +35,6 @@ const IFWL_Edit* CFWL_Edit::GetWidget() const {
   return static_cast<IFWL_Edit*>(m_pIface.get());
 }
 
-FWL_Error CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {
-  if (m_pIface)
-    return FWL_Error::Indefinite;
-  if (pProperties) {
-    *m_pProperties = *pProperties;
-  }
-  std::unique_ptr<IFWL_Edit> pEdit(
-      new IFWL_Edit(m_pProperties->MakeWidgetImpProperties(nullptr), nullptr));
-  FWL_Error ret = pEdit->Initialize();
-  if (ret != FWL_Error::Succeeded) {
-    return ret;
-  }
-  m_pIface = std::move(pEdit);
-  CFWL_Widget::Initialize();
-  return FWL_Error::Succeeded;
-}
-
 FWL_Error CFWL_Edit::SetText(const CFX_WideString& wsText) {
   if (!GetWidget())
     return FWL_Error::Indefinite;
@@ -234,7 +235,3 @@ FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf,
                                          const CFX_ByteStringC& bsReplace) {
   return GetWidget()->ReplaceSpellCheckWord(pointf, bsReplace);
 }
-
-CFWL_Edit::CFWL_Edit() {}
-
-CFWL_Edit::~CFWL_Edit() {}
-- 
cgit v1.2.3