From 000b95b3c9dd7c7fbfbd6359404a09dfdc2d5226 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Tue, 21 Nov 2017 16:36:40 +0000
Subject: Rename CXFA_DataData::TryMeasure

This CL renames CXFA_DataData::TryMeasure to TryMeasureAsFloat and
changes to return an Optional instead of a bool with an out-param.

Change-Id: I5adb75e3b8a2fb19330b33c90111f59f8c8cf722
Reviewed-on: https://pdfium-review.googlesource.com/18910
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fxfa/parser/cxfa_widgetdata.cpp | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')

diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 3938884d0d..d0efce71a0 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -328,45 +328,27 @@ CXFA_BindData CXFA_WidgetData::GetBindData() {
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryWidth() {
-  float width = 0;
-  if (TryMeasure(XFA_Attribute::W, width))
-    return {width};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::W);
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryHeight() {
-  float height = 0;
-  if (TryMeasure(XFA_Attribute::H, height))
-    return {height};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::H);
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryMinWidth() {
-  float minWidth = 0;
-  if (TryMeasure(XFA_Attribute::MinW, minWidth))
-    return {minWidth};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::MinW);
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryMinHeight() {
-  float minHeight = 0;
-  if (TryMeasure(XFA_Attribute::MinH, minHeight))
-    return {minHeight};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::MinH);
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryMaxWidth() {
-  float maxWidth = 0;
-  if (TryMeasure(XFA_Attribute::MaxW, maxWidth))
-    return {maxWidth};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::MaxW);
 }
 
 pdfium::Optional<float> CXFA_WidgetData::TryMaxHeight() {
-  float maxHeight = 0;
-  if (TryMeasure(XFA_Attribute::MaxH, maxHeight))
-    return {maxHeight};
-  return {};
+  return TryMeasureAsFloat(XFA_Attribute::MaxH);
 }
 
 CXFA_BorderData CXFA_WidgetData::GetUIBorderData() {
-- 
cgit v1.2.3