Use virtual function to retrieve interface pointer

Use virtual function to return the actual interface type instead
of the base interface type to avoid a lot of casts.

Also tidy up CFWL_Widget by encapsulating variables, and use
smart pointers for class owned member variables.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp b/xfa/fwl/lightwidget/cfwl_pushbutton.cpp
index 7c8a9fa64d..b1031692dd 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp
+++ b/xfa/fwl/lightwidget/cfwl_pushbutton.cpp
@@ -8,6 +8,14 @@
 
 #include <memory>
 
+IFWL_PushButton* CFWL_PushButton::GetWidget() {
+  return static_cast<IFWL_PushButton*>(m_pIface.get());
+}
+
+const IFWL_PushButton* CFWL_PushButton::GetWidget() const {
+  return static_cast<IFWL_PushButton*>(m_pIface.get());
+}
+
 CFWL_PushButton* CFWL_PushButton::Create() {
   return new CFWL_PushButton;
 }
@@ -25,7 +33,7 @@ FWL_Error CFWL_PushButton::Initialize(
   if (ret != FWL_Error::Succeeded) {
     return ret;
   }
-  m_pIface = pPushButton.release();
+  m_pIface = std::move(pPushButton);
   CFWL_Widget::Initialize();
   return FWL_Error::Succeeded;
 }