diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 16:39:18 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 22:11:40 +0000 |
| commit | 45da0f2d84c97a9856492265a1fc706d04bdfccd (patch) | |
| tree | 94f0e37415c91fdd7b91d22037e2d7a421e30986 /xfa/fxfa/parser/cxfa_fontdata.cpp | |
| parent | 8afa22d5701a6c47b3f34267a2c52948efc3d301 (diff) | |
| download | pdfium-45da0f2d84c97a9856492265a1fc706d04bdfccd.tar.xz | |
Fold CXFA_FillData into CXFA_Fill
This CL removes the CXFA_FillData wrapper and puts the code directly in
CXFA_Fill.
Change-Id: I44ae8b53978b659480a4bb32719d086c7b91b49b
Reviewed-on: https://pdfium-review.googlesource.com/22210
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_fontdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_fontdata.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_fontdata.cpp b/xfa/fxfa/parser/cxfa_fontdata.cpp index 88dc930dab..64b5af0794 100644 --- a/xfa/fxfa/parser/cxfa_fontdata.cpp +++ b/xfa/fxfa/parser/cxfa_fontdata.cpp @@ -8,7 +8,6 @@ #include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_fill.h" -#include "xfa/fxfa/parser/cxfa_filldata.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/cxfa_node.h" @@ -78,13 +77,12 @@ bool CXFA_FontData::IsItalic() const { } void CXFA_FontData::SetColor(FX_ARGB color) { - CXFA_FillData( - m_pNode->JSObject()->GetProperty<CXFA_Fill>(0, XFA_Element::Fill, true)) - .SetColor(color); + m_pNode->JSObject() + ->GetProperty<CXFA_Fill>(0, XFA_Element::Fill, true) + ->SetColor(color); } FX_ARGB CXFA_FontData::GetColor() const { - CXFA_FillData fillData( - m_pNode->GetChild<CXFA_Fill>(0, XFA_Element::Fill, false)); - return fillData.HasValidNode() ? fillData.GetColor(true) : 0xFF000000; + CXFA_Fill* fill = m_pNode->GetChild<CXFA_Fill>(0, XFA_Element::Fill, false); + return fill ? fill->GetColor(true) : 0xFF000000; } |