diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 11:11:16 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 17:21:40 +0000 |
| commit | cbd4410908e2a4898fdd5e0d6d17591fc2c71f54 (patch) | |
| tree | 85ee81736d4c8de97e117a6500fafe6ac3c726fb /xfa/fxfa/parser/cxfa_datadata.cpp | |
| parent | cf3d40d10276686f972761bafd005a7715f6eb1c (diff) | |
| download | pdfium-cbd4410908e2a4898fdd5e0d6d17591fc2c71f54.tar.xz | |
Fold CXFA_MarginData into CXFA_Marginchromium/3311
This CL removes the CXFA_MarginData wrapper and moves the methods
directly to CXFA_Margin.
Change-Id: I7c9e979fb78d0d356605f1318489daabcb8c32cd
Reviewed-on: https://pdfium-review.googlesource.com/22110
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_datadata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_datadata.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_datadata.cpp b/xfa/fxfa/parser/cxfa_datadata.cpp index b2c8119639..76a4651d0d 100644 --- a/xfa/fxfa/parser/cxfa_datadata.cpp +++ b/xfa/fxfa/parser/cxfa_datadata.cpp @@ -71,9 +71,5 @@ XFA_Element CXFA_DataData::GetElementType() const { pdfium::Optional<float> CXFA_DataData::TryMeasureAsFloat( XFA_Attribute attr) const { - pdfium::Optional<CXFA_Measurement> measure = - m_pNode->JSObject()->TryMeasure(attr, false); - if (measure) - return {measure->ToUnit(XFA_Unit::Pt)}; - return {}; + return m_pNode->JSObject()->TryMeasureAsFloat(attr); } |