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_textlayout.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_textlayout.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textlayout.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index 133f564deb..6f19e8add1 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -27,7 +27,7 @@ #include "xfa/fxfa/cxfa_textprovider.h" #include "xfa/fxfa/cxfa_texttabstopscontext.h" #include "xfa/fxfa/cxfa_textuserdata.h" -#include "xfa/fxfa/parser/cxfa_fontdata.h" +#include "xfa/fxfa/parser/cxfa_font.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_para.h" @@ -148,13 +148,12 @@ void CXFA_TextLayout::InitBreak(float fLineWidth) { m_pBreak->SetLineBoundary(fStart, fLineWidth); m_pBreak->SetLineStartPos(fStartPos); - CXFA_FontData fontData = m_pTextProvider->GetFontData(); - if (fontData.HasValidNode()) { + CXFA_Font* font = m_pTextProvider->GetFont(); + if (font) { m_pBreak->SetHorizontalScale( - static_cast<int32_t>(fontData.GetHorizontalScale())); - m_pBreak->SetVerticalScale( - static_cast<int32_t>(fontData.GetVerticalScale())); - m_pBreak->SetCharSpace(fontData.GetLetterSpacing()); + static_cast<int32_t>(font->GetHorizontalScale())); + m_pBreak->SetVerticalScale(static_cast<int32_t>(font->GetVerticalScale())); + m_pBreak->SetCharSpace(font->GetLetterSpacing()); } float fFontSize = m_textParser.GetFontSize(m_pTextProvider, nullptr); |