From 7322343b9322b93d97077575f95a00dcca3f0451 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 28 Apr 2016 10:51:13 -0700 Subject: More FWL interface cleanup. This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are removed in favour of their concrete classes. Review-Url: https://codereview.chromium.org/1921853006 --- xfa/fxfa/app/xfa_fffield.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/app/xfa_fffield.cpp') diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp index b48893a1fc..d19bb4cf37 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -8,7 +8,7 @@ #include "xfa/fwl/basewidget/ifwl_edit.h" #include "xfa/fwl/core/cfwl_message.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" +#include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/lightwidget/cfwl_edit.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fwltheme.h" @@ -334,10 +334,8 @@ void CXFA_FFField::SetFWLRect() { return; } CFX_RectF rtUi = m_rtUI; - if (rtUi.width < 1.0) { - ASSERT(rtUi.width < 1.0); + if (rtUi.width < 1.0) rtUi.width = 1.0; - } if (!m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) { FX_FLOAT fFontSize = m_pDataAcc->GetFontSize(); if (rtUi.height < fFontSize) { -- cgit v1.2.3