diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-23 16:49:34 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-23 16:49:34 +0000 |
commit | 66b9fa0e45b9b31882f0b78bb9213f634e211bbf (patch) | |
tree | 9e673de89120e628c145b384660df694be801ea8 /xfa/fxfa/cxfa_ffdocview.cpp | |
parent | ee896918c970128787549051bb2942b61be2d70c (diff) | |
download | pdfium-66b9fa0e45b9b31882f0b78bb9213f634e211bbf.tar.xz |
Cleanup CXFA_FFDocView header
This CL removes unused methods, makes internal methods private and
removes unused default params.
Change-Id: Ic83a97e3f751a49d3f9fc7c157e8d34a62818cd5
Reviewed-on: https://pdfium-review.googlesource.com/23570
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffdocview.cpp')
-rw-r--r-- | xfa/fxfa/cxfa_ffdocview.cpp | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp index 375a319c20..50fa5033fe 100644 --- a/xfa/fxfa/cxfa_ffdocview.cpp +++ b/xfa/fxfa/cxfa_ffdocview.cpp @@ -57,18 +57,9 @@ const XFA_AttributeEnum gs_EventActivity[] = { XFA_AttributeEnum::Unknown, }; -CXFA_FFDocView::CXFA_FFDocView(CXFA_FFDoc* pDoc) - : m_bLayoutEvent(false), - m_pListFocusWidget(nullptr), - m_bInLayoutStatus(false), - m_pDoc(pDoc), - m_pXFADocLayout(nullptr), - m_iStatus(XFA_DOCVIEW_LAYOUTSTATUS_None), - m_iLock(0) {} +CXFA_FFDocView::CXFA_FFDocView(CXFA_FFDoc* pDoc) : m_pDoc(pDoc) {} -CXFA_FFDocView::~CXFA_FFDocView() { - DestroyDocView(); -} +CXFA_FFDocView::~CXFA_FFDocView() {} void CXFA_FFDocView::InitLayout(CXFA_Node* pNode) { RunBindItems(); @@ -76,7 +67,7 @@ void CXFA_FFDocView::InitLayout(CXFA_Node* pNode) { ExecEventActivityByDeepFirst(pNode, XFA_EVENT_IndexChange, false, true); } -int32_t CXFA_FFDocView::StartLayout(int32_t iStartPage) { +int32_t CXFA_FFDocView::StartLayout() { m_iStatus = XFA_DOCVIEW_LAYOUTSTATUS_Start; m_pDoc->GetXFADoc()->DoProtoMerge(); m_pDoc->GetXFADoc()->DoDataMerge(); @@ -273,16 +264,6 @@ CXFA_FFDocView::CreateReadyNodeIterator() { : nullptr; } -void CXFA_FFDocView::KillFocus() { - if (m_pFocusWidget && - (m_pFocusWidget->GetStatus() & XFA_WidgetStatus_Focused)) { - m_pFocusWidget->OnKillFocus(nullptr); - } - m_pFocusAcc = nullptr; - m_pFocusWidget = nullptr; - m_pOldFocusWidget = nullptr; -} - bool CXFA_FFDocView::SetFocus(CXFA_FFWidget* hWidget) { CXFA_FFWidget* pNewFocus = hWidget; if (m_pOldFocusWidget == pNewFocus) @@ -308,13 +289,6 @@ bool CXFA_FFDocView::SetFocus(CXFA_FFWidget* hWidget) { return false; pNewFocus = m_pOldFocusWidget.Get(); - if (m_pListFocusWidget && pNewFocus == m_pListFocusWidget) { - m_pFocusAcc = nullptr; - m_pFocusWidget = nullptr; - m_pListFocusWidget = nullptr; - m_pOldFocusWidget = nullptr; - return false; - } if (pNewFocus && (pNewFocus->GetStatus() & XFA_WidgetStatus_Visible)) { if (!pNewFocus->IsLoaded()) pNewFocus->LoadWidget(); @@ -471,11 +445,6 @@ void CXFA_FFDocView::OnPageEvent(CXFA_ContainerLayoutItem* pSender, } -void CXFA_FFDocView::AddInvalidateRect(CXFA_FFWidget* pWidget, - const CFX_RectF& rtInvalidate) { - AddInvalidateRect(pWidget->GetPageView(), rtInvalidate); -} - void CXFA_FFDocView::AddInvalidateRect(CXFA_FFPageView* pPageView, const CFX_RectF& rtInvalidate) { if (m_mapPageInvalidate[pPageView]) { @@ -545,15 +514,6 @@ void CXFA_FFDocView::RunDocClose() { ExecEventActivityByDeepFirst(pRootItem, XFA_EVENT_DocClose, false, true); } -void CXFA_FFDocView::DestroyDocView() { - ClearInvalidateList(); - m_iStatus = XFA_DOCVIEW_LAYOUTSTATUS_None; - m_iLock = 0; - m_ValidateAccs.clear(); - m_BindItems.clear(); - m_CalculateAccs.clear(); -} - void CXFA_FFDocView::AddCalculateWidgetAcc(CXFA_WidgetAcc* pWidgetAcc) { CXFA_WidgetAcc* pCurrentAcc = !m_CalculateAccs.empty() ? m_CalculateAccs.back() : nullptr; |