From 2f265dbf12831dece93a6a932fd99e5737cd1afd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 8 Jan 2018 12:28:27 -0500 Subject: Move proxy methods from CXFA_WidgetAcc to CXFA_Node This CL moves methods from WidgetAcc which just proxy to CXFA_Node. Change-Id: Icf1006b4be3f91077de411ed1a571b1507117602 Reviewed-on: https://pdfium-review.googlesource.com/22391 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffpushbutton.cpp | 10 +++++----- 1 file changed, 5 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 a1250b5785..f42e5257b5 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -100,11 +100,11 @@ bool CXFA_FFPushButton::PerformLayout() { CFX_RectF rtWidget = GetRectWithoutRotate(); m_rtUI = rtWidget; - CXFA_Margin* margin = m_pDataAcc->GetMargin(); + CXFA_Margin* margin = m_pDataAcc->GetNode()->GetMargin(); if (margin) XFA_RectWidthoutMargin(rtWidget, margin); - CXFA_Caption* caption = m_pDataAcc->GetCaption(); + CXFA_Caption* caption = m_pDataAcc->GetNode()->GetCaption(); m_rtCaption = rtWidget; CXFA_Margin* captionMargin = caption->GetMargin(); if (captionMargin) @@ -118,7 +118,7 @@ bool CXFA_FFPushButton::PerformLayout() { return true; } float CXFA_FFPushButton::GetLineWidth() { - CXFA_Border* border = m_pDataAcc->GetBorder(false); + CXFA_Border* border = m_pDataAcc->GetNode()->GetBorder(false); if (border && border->GetPresence() == XFA_AttributeEnum::Visible) return border->GetEdge(0)->GetThickness(); return 0; @@ -133,7 +133,7 @@ FX_ARGB CXFA_FFPushButton::GetFillColor() { } void CXFA_FFPushButton::LoadHighlightCaption() { - CXFA_Caption* caption = m_pDataAcc->GetCaption(); + CXFA_Caption* caption = m_pDataAcc->GetNode()->GetCaption(); if (!caption || caption->IsHidden()) return; @@ -168,7 +168,7 @@ void CXFA_FFPushButton::LayoutHighlightCaption() { void CXFA_FFPushButton::RenderHighlightCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) { CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout(); - CXFA_Caption* caption = m_pDataAcc->GetCaption(); + CXFA_Caption* caption = m_pDataAcc->GetNode()->GetCaption(); if (!caption || !caption->IsVisible()) return; -- cgit v1.2.3