diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-22 18:43:17 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-22 18:43:17 +0000 |
| commit | ed4038bc335385b7e341d8de5c2bec8db5dcdcb6 (patch) | |
| tree | 86af694f9185c0be181c778cf45ede8f57791534 /xfa/fxfa/cxfa_fwltheme.cpp | |
| parent | d7d584df24fda9c9a28330959cc28f94dc0294e2 (diff) | |
| download | pdfium-ed4038bc335385b7e341d8de5c2bec8db5dcdcb6.tar.xz | |
Move the UI elements from CXFA_WidgetAcc to CXFA_Node
This CL moves the methods and members related to the UI nodes from the
CXFA_WidgetAcc class to the CXFA_Node class.
Change-Id: I1fdc5173787141065f1e607bbfefa3b22af738b4
Reviewed-on: https://pdfium-review.googlesource.com/23290
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fwltheme.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_fwltheme.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index 920968269f..c7c521ea66 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp @@ -147,18 +147,17 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) { } CFX_RectF CXFA_FWLTheme::GetUIMargin(CFWL_ThemePart* pThemePart) const { - CFX_RectF rect; CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pThemePart->m_pWidget); if (!pWidget) - return rect; + return CFX_RectF(); CXFA_LayoutItem* pItem = pWidget; - CXFA_WidgetAcc* pWidgetAcc = pWidget->GetNode()->GetWidgetAcc(); - rect = pWidgetAcc->GetUIMargin(); - CXFA_Para* para = pWidgetAcc->GetNode()->GetParaIfExists(); + CXFA_Node* pNode = pWidget->GetNode(); + CFX_RectF rect = pNode->GetUIMargin(); + CXFA_Para* para = pNode->GetParaIfExists(); if (para) { rect.left += para->GetMarginLeft(); - if (pWidgetAcc->IsMultiLine()) + if (pNode->GetWidgetAcc()->IsMultiLine()) rect.width += para->GetMarginRight(); } if (!pItem->GetPrev()) { |