From 89ab499024b1f362b1d40dabd9fadded8b095203 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 8 Dec 2016 14:06:10 -0800 Subject: Change layout item in CFWL_Widget type from void Previously the LayoutItem was a void*. This Cl changes the LayoutItem to explicity be a CXFA_FFWidget. Review-Url: https://codereview.chromium.org/2559643004 --- xfa/fxfa/app/xfa_fwladapter.cpp | 6 ++---- xfa/fxfa/app/xfa_fwltheme.cpp | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp index 3f3dc160b9..3dfa679c4b 100644 --- a/xfa/fxfa/app/xfa_fwladapter.cpp +++ b/xfa/fxfa/app/xfa_fwladapter.cpp @@ -17,8 +17,7 @@ void CXFA_FWLAdapterWidgetMgr::RepaintWidget(CFWL_Widget* pWidget) { if (!pWidget) return; - CXFA_FFWidget* pFFWidget = - static_cast(pWidget->GetLayoutItem()); + CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem(); if (!pFFWidget) return; @@ -30,8 +29,7 @@ bool CXFA_FWLAdapterWidgetMgr::GetPopupPos(CFWL_Widget* pWidget, FX_FLOAT fMaxHeight, const CFX_RectF& rtAnchor, CFX_RectF& rtPopup) { - CXFA_FFWidget* pFFWidget = - static_cast(pWidget->GetLayoutItem()); + CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem(); CFX_Matrix mt; pFFWidget->GetRotateMatrix(mt); CFX_RectF rtRotateAnchor(rtAnchor); diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index 2ca6237109..5a494f1231 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -38,9 +38,7 @@ CXFA_FFWidget* XFA_ThemeGetOuterWidget(CFWL_Widget* pWidget) { CFWL_Widget* pOuter = pWidget; while (pOuter && pOuter->GetOuter()) pOuter = pOuter->GetOuter(); - - return pOuter ? static_cast(pOuter->GetLayoutItem()) - : nullptr; + return pOuter ? pOuter->GetLayoutItem() : nullptr; } CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp) -- cgit v1.2.3