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_ffpushbutton.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_ffpushbutton.cpp') diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index d4d591f87a..d0611bbd8c 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -71,7 +71,7 @@ bool CXFA_FFPushButton::LoadWidget() { void CXFA_FFPushButton::UpdateWidgetProperty() { uint32_t dwStyleEx = 0; - switch (m_pNode->GetWidgetAcc()->GetButtonHighlight()) { + switch (m_pNode->GetButtonHighlight()) { case XFA_AttributeEnum::Inverted: dwStyleEx = XFA_FWL_PSBSTYLEEXT_HiliteInverted; break; @@ -141,7 +141,7 @@ void CXFA_FFPushButton::LoadHighlightCaption() { if (!caption || caption->IsHidden()) return; - if (m_pNode->GetWidgetAcc()->HasButtonRollover()) { + if (m_pNode->HasButtonRollover()) { if (!m_pRollProvider) { m_pRollProvider = pdfium::MakeUnique( m_pNode.Get(), XFA_TEXTPROVIDERTYPE_Rollover); @@ -150,7 +150,7 @@ void CXFA_FFPushButton::LoadHighlightCaption() { pdfium::MakeUnique(GetDoc(), m_pRollProvider.get()); } - if (m_pNode->GetWidgetAcc()->HasButtonDown()) { + if (m_pNode->HasButtonDown()) { if (!m_pDownProvider) { m_pDownProvider = pdfium::MakeUnique( m_pNode.Get(), XFA_TEXTPROVIDERTYPE_Down); @@ -171,8 +171,7 @@ void CXFA_FFPushButton::LayoutHighlightCaption() { void CXFA_FFPushButton::RenderHighlightCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) { - CXFA_TextLayout* pCapTextLayout = - m_pNode->GetWidgetAcc()->GetCaptionTextLayout(); + CXFA_TextLayout* pCapTextLayout = m_pNode->GetCaptionTextLayout(); CXFA_Caption* caption = m_pNode->GetCaptionIfExists(); if (!caption || !caption->IsVisible()) return; -- cgit v1.2.3