diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-08 15:47:33 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-08 21:09:35 +0000 |
| commit | 88c8e2fe2076fa4b5088b912dd92c3b2a56bb3ec (patch) | |
| tree | 3e7359b0b3d00a6afc60744428f579d8b2d01a33 /xfa/fxfa/cxfa_ffnotify.cpp | |
| parent | 94fc2af0c9a800f39e4dbcac859f1ad490f7d725 (diff) | |
| download | pdfium-88c8e2fe2076fa4b5088b912dd92c3b2a56bb3ec.tar.xz | |
Differentiate the type of LayoutItem to create
This CL splits CXFA_FFNotify::OnCreateLayoutItem into a Content and
Container variant. This removes the need for casting at the two call
sites.
Change-Id: Ic19bf4398f0ea32099c270f3bb585a18004ccb5d
Reviewed-on: https://pdfium-review.googlesource.com/22412
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffnotify.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffnotify.cpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp index 21273f246d..5dc06f90b8 100644 --- a/xfa/fxfa/cxfa_ffnotify.cpp +++ b/xfa/fxfa/cxfa_ffnotify.cpp @@ -99,14 +99,22 @@ void CXFA_FFNotify::OnWidgetListItemRemoved(CXFA_WidgetAcc* pSender, } } -CXFA_LayoutItem* CXFA_FFNotify::OnCreateLayoutItem(CXFA_Node* pNode) { - CXFA_LayoutProcessor* pLayout = m_pDoc->GetXFADoc()->GetDocLayout(); - CXFA_FFDocView* pDocView = m_pDoc->GetDocView(pLayout); +CXFA_ContainerLayoutItem* CXFA_FFNotify::OnCreateContainerLayoutItem( + CXFA_Node* pNode) { + XFA_Element type = pNode->GetElementType(); + ASSERT(type == XFA_Element::ContentArea || type == XFA_Element::PageArea); + + if (type == XFA_Element::PageArea) { + CXFA_LayoutProcessor* pLayout = m_pDoc->GetXFADoc()->GetDocLayout(); + return new CXFA_FFPageView(m_pDoc->GetDocView(pLayout), pNode); + } + return new CXFA_ContainerLayoutItem(pNode); +} + +CXFA_ContentLayoutItem* CXFA_FFNotify::OnCreateContentLayoutItem( + CXFA_Node* pNode) { XFA_Element eType = pNode->GetElementType(); - if (eType == XFA_Element::PageArea) - return new CXFA_FFPageView(pDocView, pNode); - if (eType == XFA_Element::ContentArea) - return new CXFA_ContainerLayoutItem(pNode); + ASSERT(eType != XFA_Element::ContentArea && eType != XFA_Element::PageArea); // We only need to create the widget for certain types of objects. if (!XFA_IsCreateWidget(eType)) @@ -177,8 +185,10 @@ CXFA_LayoutItem* CXFA_FFNotify::OnCreateLayoutItem(CXFA_Node* pNode) { break; } - if (pWidget) - pWidget->SetDocView(pDocView); + if (pWidget) { + CXFA_LayoutProcessor* pLayout = m_pDoc->GetXFADoc()->GetDocLayout(); + pWidget->SetDocView(m_pDoc->GetDocView(pLayout)); + } return pWidget; } |