summaryrefslogtreecommitdiff
path: root/xfa/fwl/core/cfwl_picturebox.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-10-31 07:29:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-31 07:29:34 -0700
commit20855384b8149a631c3c1d229551523c12eb767b (patch)
treee3cef278e322742bea6c4b48f40ed580754ebd80 /xfa/fwl/core/cfwl_picturebox.cpp
parent747dcf775c5cb661e96a639f73322cc489d8590f (diff)
downloadpdfium-20855384b8149a631c3c1d229551523c12eb767b.tar.xz
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
Diffstat (limited to 'xfa/fwl/core/cfwl_picturebox.cpp')
-rw-r--r--xfa/fwl/core/cfwl_picturebox.cpp40
1 files changed, 18 insertions, 22 deletions
diff --git a/xfa/fwl/core/cfwl_picturebox.cpp b/xfa/fwl/core/cfwl_picturebox.cpp
index 92058a9818..8210db2562 100644
--- a/xfa/fwl/core/cfwl_picturebox.cpp
+++ b/xfa/fwl/core/cfwl_picturebox.cpp
@@ -8,6 +8,24 @@
#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());
}
@@ -16,24 +34,6 @@ 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;
}
@@ -97,10 +97,6 @@ FWL_Error CFWL_PictureBox::SetOffset(FX_FLOAT fx, FX_FLOAT 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),