diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 16:53:33 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 14:47:31 +0000 |
| commit | e83a915ebd3afaa897dbbf3e6cb3d2a2cb198595 (patch) | |
| tree | b9c632251a7500be1e0acfe6d18ce35003ca2785 /xfa/fxfa/cxfa_textprovider.cpp | |
| parent | 45da0f2d84c97a9856492265a1fc706d04bdfccd (diff) | |
| download | pdfium-e83a915ebd3afaa897dbbf3e6cb3d2a2cb198595.tar.xz | |
Fold CXFA_FontData into CXFA_Font
This CL removes the CXFA_FontData wrapper and puts the functionality
into CXFA_Font.
Change-Id: Id7e3a71106816a05843a62645f5955a70f7eaeaa
Reviewed-on: https://pdfium-review.googlesource.com/22113
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textprovider.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textprovider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index 461fa5dde4..b32241ea35 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -126,14 +126,14 @@ CXFA_Para* CXFA_TextProvider::GetPara() { return pNode->GetChild<CXFA_Para>(0, XFA_Element::Para, false); } -CXFA_FontData CXFA_TextProvider::GetFontData() { +CXFA_Font* CXFA_TextProvider::GetFont() { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) - return m_pWidgetAcc->GetFontData(false); + return m_pWidgetAcc->GetFont(false); CXFA_Caption* pNode = m_pWidgetAcc->GetNode()->GetChild<CXFA_Caption>( 0, XFA_Element::Caption, false); CXFA_Font* font = pNode->GetChild<CXFA_Font>(0, XFA_Element::Font, false); - return font ? CXFA_FontData(font) : m_pWidgetAcc->GetFontData(false); + return font ? font : m_pWidgetAcc->GetFont(false); } bool CXFA_TextProvider::IsCheckButtonAndAutoWidth() { |