Remove FWL globals.

xfa/fwl/core/cfwl_picturebox.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/cfwl_picturebox.h"
 
 #include <memory>
 
+CFWL_PictureBox::CFWL_PictureBox(const IFWL_App* app) : CFWL_Widget(app) {}
+
+CFWL_PictureBox::~CFWL_PictureBox() {}
+
+void CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) {
+  ASSERT(!m_pIface);
+
+  if (pProperties)
+    *m_pProperties = *pProperties;
+
+  std::unique_ptr<IFWL_PictureBox> pPictureBox(new IFWL_PictureBox(
+      m_pApp, m_pProperties->MakeWidgetImpProperties(&m_PictureBoxDP)));
+  pPictureBox->Initialize();
+
+  m_pIface = std::move(pPictureBox);
+  CFWL_Widget::Initialize(pProperties);
+}
+
 IFWL_PictureBox* CFWL_PictureBox::GetWidget() {
   return static_cast<IFWL_PictureBox*>(m_pIface.get());
 }
 
 const IFWL_PictureBox* CFWL_PictureBox::GetWidget() const {
   return static_cast<IFWL_PictureBox*>(m_pIface.get());
 }
 
-FWL_Error CFWL_PictureBox::Initialize(
-    const CFWL_WidgetProperties* pProperties) {
-  if (m_pIface)
-    return FWL_Error::Indefinite;
-  if (pProperties) {
-    *m_pProperties = *pProperties;
-  }
-  std::unique_ptr<IFWL_PictureBox> pPictureBox(new IFWL_PictureBox(
-      m_pProperties->MakeWidgetImpProperties(&m_PictureBoxDP)));
-  FWL_Error ret = pPictureBox->Initialize();
-  if (ret != FWL_Error::Succeeded) {
-    return ret;
-  }
-  m_pIface = std::move(pPictureBox);
-  CFWL_Widget::Initialize();
-  return FWL_Error::Succeeded;
-}
-
 CFX_DIBitmap* CFWL_PictureBox::GetPicture() {
   return m_PictureBoxDP.m_pBitmap;
 }
 
 FWL_Error CFWL_PictureBox::SetPicture(CFX_DIBitmap* pBitmap) {
   m_PictureBoxDP.m_pBitmap = pBitmap;
   return FWL_Error::Succeeded;
 }
 
 FX_FLOAT CFWL_PictureBox::GetRotation() {
@@ skipping 43 matching lines @@
   fy = matrix.f;
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFWL_PictureBox::SetOffset(FX_FLOAT fx, FX_FLOAT fy) {
   m_PictureBoxDP.m_fOffSetX = fx;
   m_PictureBoxDP.m_fOffSetY = fy;
   return FWL_Error::Succeeded;
 }
 
-CFWL_PictureBox::CFWL_PictureBox() {}
-
-CFWL_PictureBox::~CFWL_PictureBox() {}
-
 CFWL_PictureBox::CFWL_PictureBoxDP::CFWL_PictureBoxDP()
     : m_pBitmap(nullptr),
       m_iOpacity(0),
       m_iFlipMode(0),
       m_fRotation(0.0f),
       m_fScaleX(1.0f),
       m_fScaleY(1.0f),
       m_fOffSetX(0.0f),
       m_fOffSetY(0.0f) {}
 
@@ skipping 33 matching lines @@
   matrix.Rotate(m_fRotation);
   matrix.Translate(fLen, fWid);
   matrix.Scale(m_fScaleX, m_fScaleY);
   matrix.Translate(m_fOffSetX, m_fOffSetY);
   return FWL_Error::Succeeded;
 }
 
 int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetFlipMode(IFWL_Widget* pWidget) {
   return m_iFlipMode;
 }