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 /fxjs | |
| 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 'fxjs')
| -rw-r--r-- | fxjs/xfa/cjx_object.cpp | 8 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 304b861dcf..b1e3030020 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -431,6 +431,14 @@ pdfium::Optional<CXFA_Measurement> CJX_Object::TryMeasure( return ToNode(GetXFAObject())->GetDefaultMeasurement(eAttr); } +pdfium::Optional<float> CJX_Object::TryMeasureAsFloat( + XFA_Attribute attr) const { + pdfium::Optional<CXFA_Measurement> measure = TryMeasure(attr, false); + if (measure) + return {measure->ToUnit(XFA_Unit::Pt)}; + return {}; +} + CXFA_Measurement CJX_Object::GetMeasure(XFA_Attribute eAttr) const { return TryMeasure(eAttr, true).value_or(CXFA_Measurement()); } diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h index f6ce3ccfb8..32bb01f3f6 100644 --- a/fxjs/xfa/cjx_object.h +++ b/fxjs/xfa/cjx_object.h @@ -197,6 +197,7 @@ class CJX_Object { pdfium::Optional<CXFA_Measurement> TryMeasure(XFA_Attribute eAttr, bool bUseDefault) const; + pdfium::Optional<float> TryMeasureAsFloat(XFA_Attribute attr) const; bool SetMeasure(XFA_Attribute eAttr, CXFA_Measurement mValue, bool bNotify); CXFA_Measurement GetMeasure(XFA_Attribute eAttr) const; |