From 23efbbd8a1840d5dd746d94069741b0532b61b14 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 2 Nov 2017 19:21:48 +0000 Subject: Remove default value from CJX_Node::{Set|Try}Measure This CL removes the default values from {Set|Try}Measure and inlines into the call sites. Change-Id: I2356b92d419203cc1cdbea865b6e04b728430f5a Reviewed-on: https://pdfium-review.googlesource.com/17551 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_layoutpagemgr.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_layoutpagemgr.cpp') diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp index a483d71840..568b7ebb19 100644 --- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp +++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp @@ -327,14 +327,14 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { pPageArea->InsertChild(pContentArea, nullptr); pContentArea->SetFlag(XFA_NodeFlag_Initialized, true); - pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_X, - CXFA_Measurement(0.25f, XFA_UNIT_In)); - pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_Y, - CXFA_Measurement(0.25f, XFA_UNIT_In)); - pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_W, - CXFA_Measurement(8.0f, XFA_UNIT_In)); - pContentArea->JSNode()->SetMeasure(XFA_ATTRIBUTE_H, - CXFA_Measurement(10.5f, XFA_UNIT_In)); + pContentArea->JSNode()->SetMeasure( + XFA_ATTRIBUTE_X, CXFA_Measurement(0.25f, XFA_UNIT_In), false); + pContentArea->JSNode()->SetMeasure( + XFA_ATTRIBUTE_Y, CXFA_Measurement(0.25f, XFA_UNIT_In), false); + pContentArea->JSNode()->SetMeasure( + XFA_ATTRIBUTE_W, CXFA_Measurement(8.0f, XFA_UNIT_In), false); + pContentArea->JSNode()->SetMeasure( + XFA_ATTRIBUTE_H, CXFA_Measurement(10.5f, XFA_UNIT_In), false); } CXFA_Node* pMedium = pPageArea->GetChild(0, XFA_Element::Medium); if (!pMedium) { @@ -346,9 +346,9 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { pPageArea->InsertChild(pMedium, nullptr); pMedium->SetFlag(XFA_NodeFlag_Initialized, true); pMedium->JSNode()->SetMeasure(XFA_ATTRIBUTE_Short, - CXFA_Measurement(8.5f, XFA_UNIT_In)); + CXFA_Measurement(8.5f, XFA_UNIT_In), false); pMedium->JSNode()->SetMeasure(XFA_ATTRIBUTE_Long, - CXFA_Measurement(11.0f, XFA_UNIT_In)); + CXFA_Measurement(11.0f, XFA_UNIT_In), false); } return true; } -- cgit v1.2.3