From 414cc9c9676b01587010ec5475d495eef6e05ba3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 23 Jan 2018 21:17:43 +0000 Subject: Remove GetWidgetAcc calls This CL removes the calls to CXFA_Node::GetWidgetAcc() as they redundantly return the node they were called upon. Change-Id: I46e66cf98137a1dee7cd3fa8bc7d379eb97fded5 Reviewed-on: https://pdfium-review.googlesource.com/23630 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_fffield.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.cpp') diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 8ac287641d..05319b3dc9 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -126,7 +126,7 @@ bool CXFA_FFField::IsLoaded() { bool CXFA_FFField::LoadWidget() { SetFWLThemeProvider(); - m_pNode->GetWidgetAcc()->LoadCaption(GetDoc()); + m_pNode->LoadCaption(GetDoc()); PerformLayout(); return true; } @@ -212,8 +212,7 @@ void CXFA_FFField::CapPlacement() { XFA_RectWithoutMargin(m_rtCaption, margin); } - CXFA_TextLayout* pCapTextLayout = - m_pNode->GetWidgetAcc()->GetCaptionTextLayout(); + CXFA_TextLayout* pCapTextLayout = m_pNode->GetCaptionTextLayout(); if (fCapReserve <= 0 && pCapTextLayout) { CFX_SizeF minSize; CFX_SizeF maxSize; @@ -583,8 +582,7 @@ bool CXFA_FFField::PtInActiveRect(const CFX_PointF& point) { } void CXFA_FFField::LayoutCaption() { - CXFA_TextLayout* pCapTextLayout = - m_pNode->GetWidgetAcc()->GetCaptionTextLayout(); + CXFA_TextLayout* pCapTextLayout = m_pNode->GetCaptionTextLayout(); if (!pCapTextLayout) return; @@ -595,8 +593,7 @@ void CXFA_FFField::LayoutCaption() { } void CXFA_FFField::RenderCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) { - CXFA_TextLayout* pCapTextLayout = - m_pNode->GetWidgetAcc()->GetCaptionTextLayout(); + CXFA_TextLayout* pCapTextLayout = m_pNode->GetCaptionTextLayout(); if (!pCapTextLayout) return; @@ -640,7 +637,7 @@ int32_t CXFA_FFField::CalculateOverride() { if (CalculateNode(exclNode) == 0) return 0; - CXFA_Node* pNode = exclNode->GetWidgetAcc()->GetExclGroupFirstMember(); + CXFA_Node* pNode = exclNode->GetExclGroupFirstMember(); if (!pNode) return 1; @@ -650,7 +647,7 @@ int32_t CXFA_FFField::CalculateOverride() { if (CalculateNode(pNode) == 0) return 0; - pNode = pNode->GetWidgetAcc()->GetExclGroupNextMember(pNode); + pNode = pNode->GetExclGroupNextMember(pNode); } return 1; } -- cgit v1.2.3