Remove IWFL_WidgetMgr in favor of CFWL_WidgetMgr

xfa/fwl/lightwidget/cfwl_widget.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/lightwidget/cfwl_widget.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
@@ skipping 199 matching lines @@
   if (!m_pIface)
     return nullptr;
 
   m_pDelegate = m_pIface->SetDelegate(pDelegate);
   return m_pDelegate;
 }
 
 CFWL_Widget::CFWL_Widget()
     : m_pIface(nullptr), m_pDelegate(nullptr), m_pProperties(nullptr) {
   m_pProperties = new CFWL_WidgetProperties;
-  m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
+  m_pWidgetMgr = static_cast<CFWL_WidgetMgr*>(IFWL_WidgetMgr::GetInstance());

[Lei Zhang, 2016/05/23 21:57:20]

Do we want to get rid of IFWL_WidgetMgr altogether in favor of CFWL_WidgetMgr?

[Tom Sepez, 2016/05/23 22:02:54]

Yes, I think so.

   ASSERT(m_pWidgetMgr);
 }
 
 CFWL_Widget::~CFWL_Widget() {
   delete m_pProperties;
   if (m_pIface) {
     m_pIface->Finalize();
     delete m_pIface;
   }
 }
@@ skipping 103 matching lines @@
   calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;
   CFX_RectF rect;
   FX_FLOAT fWidth = bMultiLine
                         ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth
                                           : FWL_WGT_CalcMultiLineDefWidth)
                         : FWL_WGT_CalcWidth;
   rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);
   pTheme->CalcTextRect(&calPart, rect);
   return CFX_SizeF(rect.width, rect.height);
 }