From 935d8d5dcbf1da2b3198675428cbf7ca0406788f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 17 May 2016 10:32:18 -0700 Subject: XFA_WIDGETSTATUS cleanup. This CL moves all of the XFA_WIDGETSTATUS values into a single enum instead of multiple defines. The values are also normalized. The name was updated to be XFA_WidgetStatus. The XFA_WIDGETFILTER and XFA_LAYOUTSTATUS defines had to match up to XFA_WIDGETSTATUS. This Cl replaces those so we just have a single enum to work with. Review-Url: https://codereview.chromium.org/1986503002 --- xfa/fxfa/app/xfa_rendercontext.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/app/xfa_rendercontext.cpp') diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp index e7bacec281..7bfd9630cb 100644 --- a/xfa/fxfa/app/xfa_rendercontext.cpp +++ b/xfa/fxfa/app/xfa_rendercontext.cpp @@ -38,10 +38,10 @@ int32_t CXFA_RenderContext::StartRender(CXFA_FFPageView* pPageView, mtRes.SetReverse(matrix); m_rtClipRect.Set(rtPage.left, rtPage.top, rtPage.width, rtPage.height); mtRes.TransformRect(m_rtClipRect); - m_dwStatus = m_options.m_bHighlight ? XFA_WIDGETSTATUS_Highlight : 0; - uint32_t dwFilterType = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_AllType | - (m_options.m_bPrint ? XFA_WIDGETSTATUS_Printable - : XFA_WIDGETSTATUS_Viewable); + m_dwStatus = m_options.m_bHighlight ? XFA_WidgetStatus_Highlight : 0; + uint32_t dwFilterType = XFA_WidgetStatus_Visible | + (m_options.m_bPrint ? XFA_WidgetStatus_Printable + : XFA_WidgetStatus_Viewable); m_pWidgetIterator = m_pPageView->CreateWidgetIterator(XFA_TRAVERSEWAY_Form, dwFilterType); m_pWidget = m_pWidgetIterator->MoveToNext(); @@ -52,7 +52,7 @@ int32_t CXFA_RenderContext::DoRender(IFX_Pause* pPause) { while (m_pWidget) { CXFA_FFWidget* pWidget = (CXFA_FFWidget*)m_pWidget; CFX_RectF rtWidgetBox; - pWidget->GetBBox(rtWidgetBox, XFA_WIDGETSTATUS_Visible); + pWidget->GetBBox(rtWidgetBox, XFA_WidgetStatus_Visible); rtWidgetBox.width += 1; rtWidgetBox.height += 1; if (rtWidgetBox.IntersectWith(m_rtClipRect)) { -- cgit v1.2.3