Chromium Code Reviews| Index: xfa/fxfa/app/xfa_ffpageview.cpp |
| diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp |
| index 54c262faacf4a4046b171390e1b7fb01d8373385..169c1f90627555d63fde61e262f4f88595e7eb41 100644 |
| --- a/xfa/fxfa/app/xfa_ffpageview.cpp |
| +++ b/xfa/fxfa/app/xfa_ffpageview.cpp |
| @@ -91,6 +91,24 @@ bool PageWidgetFilter(CXFA_FFWidget* pWidget, |
| return (dwFilter & dwStatus) == dwFilter; |
| } |
| +FX_BOOL IsLayoutElement(XFA_Element eElement, FX_BOOL bLayoutContainer) { |
|
Lei Zhang
2016/07/07 19:36:18
bools?
dsinclair
2016/07/07 19:47:48
Done.
|
| + switch (eElement) { |
| + case XFA_Element::Draw: |
| + case XFA_Element::Field: |
| + case XFA_Element::InstanceManager: |
| + return !bLayoutContainer; |
| + case XFA_Element::Area: |
| + case XFA_Element::Subform: |
| + case XFA_Element::ExclGroup: |
| + case XFA_Element::SubformSet: |
| + case XFA_Element::PageArea: |
| + case XFA_Element::Form: |
| + return TRUE; |
| + default: |
| + return FALSE; |
| + } |
| +} |
| + |
| } // namespace |
| CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) |
| @@ -373,8 +391,7 @@ void CXFA_FFTabOrderPageWidgetIterator::OrderContainer( |
| CXFA_TabParam* pParam = new CXFA_TabParam; |
| pParam->m_pWidget = hWidget; |
| tabParams.Add(pParam); |
| - if (XFA_IsLayoutElement(pSearchItem->GetFormNode()->GetElementType(), |
| - TRUE)) { |
| + if (IsLayoutElement(pSearchItem->GetFormNode()->GetElementType(), TRUE)) { |
| OrderContainer(sIterator, pSearchItem, pParam, bCurrentItem, |
| bContentArea, bMarsterPage); |
| } |