summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-08 18:03:31 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-08 18:03:31 +0000
commit517807e01712c1d4400ec8dde0ab3d9b467bbf04 (patch)
tree002e1d0ecb9cf9bb138fda369509cd8fc46afdd3 /xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
parent6bccc1228ddfccae296f8f4236512caad7cbc1c9 (diff)
downloadpdfium-517807e01712c1d4400ec8dde0ab3d9b467bbf04.tar.xz
Convert XFA_UNIT to an enum class
This CL converts the XFA_UNIT enum to the XFA_Unit enum class. Change-Id: I6e0588f265e45b863ff1ecc170279f558fb6bd67 Reviewed-on: https://pdfium-review.googlesource.com/18090 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
index 786fc2c32e..752d37473b 100644
--- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
@@ -90,25 +90,25 @@ CFX_SizeF CalculateContainerSpecifiedSize(CXFA_Node* pFormNode,
if ((eType == XFA_Element::Subform || eType == XFA_Element::ExclGroup) &&
pFormNode->JSNode()->TryMeasure(XFA_Attribute::W, mTmpValue, false) &&
mTmpValue.GetValue() > XFA_LAYOUT_FLOAT_PERCISION) {
- containerSize.width = mTmpValue.ToUnit(XFA_UNIT_Pt);
+ containerSize.width = mTmpValue.ToUnit(XFA_Unit::Pt);
*bContainerWidthAutoSize = false;
}
if ((eType == XFA_Element::Subform || eType == XFA_Element::ExclGroup) &&
pFormNode->JSNode()->TryMeasure(XFA_Attribute::H, mTmpValue, false) &&
mTmpValue.GetValue() > XFA_LAYOUT_FLOAT_PERCISION) {
- containerSize.height = mTmpValue.ToUnit(XFA_UNIT_Pt);
+ containerSize.height = mTmpValue.ToUnit(XFA_Unit::Pt);
*bContainerHeightAutoSize = false;
}
if (*bContainerWidthAutoSize && eType == XFA_Element::Subform &&
pFormNode->JSNode()->TryMeasure(XFA_Attribute::MaxW, mTmpValue, false) &&
mTmpValue.GetValue() > XFA_LAYOUT_FLOAT_PERCISION) {
- containerSize.width = mTmpValue.ToUnit(XFA_UNIT_Pt);
+ containerSize.width = mTmpValue.ToUnit(XFA_Unit::Pt);
*bContainerWidthAutoSize = false;
}
if (*bContainerHeightAutoSize && eType == XFA_Element::Subform &&
pFormNode->JSNode()->TryMeasure(XFA_Attribute::MaxH, mTmpValue, false) &&
mTmpValue.GetValue() > XFA_LAYOUT_FLOAT_PERCISION) {
- containerSize.height = mTmpValue.ToUnit(XFA_UNIT_Pt);
+ containerSize.height = mTmpValue.ToUnit(XFA_Unit::Pt);
*bContainerHeightAutoSize = false;
}
return containerSize;
@@ -129,10 +129,10 @@ CFX_SizeF CalculateContainerComponentSizeFromContentSize(
if (pMarginNode) {
if (pMarginNode->JSNode()->TryMeasure(XFA_Attribute::LeftInset, mTmpValue,
false))
- componentSize.width += mTmpValue.ToUnit(XFA_UNIT_Pt);
+ componentSize.width += mTmpValue.ToUnit(XFA_Unit::Pt);
if (pMarginNode->JSNode()->TryMeasure(XFA_Attribute::RightInset,
mTmpValue, false))
- componentSize.width += mTmpValue.ToUnit(XFA_UNIT_Pt);
+ componentSize.width += mTmpValue.ToUnit(XFA_Unit::Pt);
}
}
@@ -141,10 +141,10 @@ CFX_SizeF CalculateContainerComponentSizeFromContentSize(
if (pMarginNode) {
if (pMarginNode->JSNode()->TryMeasure(XFA_Attribute::TopInset, mTmpValue,
false))
- componentSize.height += mTmpValue.ToUnit(XFA_UNIT_Pt);
+ componentSize.height += mTmpValue.ToUnit(XFA_Unit::Pt);
if (pMarginNode->JSNode()->TryMeasure(XFA_Attribute::BottomInset,
mTmpValue, false)) {
- componentSize.height += mTmpValue.ToUnit(XFA_UNIT_Pt);
+ componentSize.height += mTmpValue.ToUnit(XFA_Unit::Pt);
}
}
}
@@ -168,16 +168,16 @@ void RelocateTableRowCells(CXFA_ContentLayoutItem* pLayoutRow,
if (pMarginNode) {
fLeftInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::LeftInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fTopInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::TopInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fRightInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::RightInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fBottomInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::BottomInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
float fContentWidthLimit =
@@ -341,16 +341,16 @@ void AddTrailerBeforeSplit(CXFA_ItemLayoutProcessor* pProcessor,
if (pMarginNode) {
fLeftInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::LeftInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fTopInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::TopInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fRightInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::RightInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fBottomInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::BottomInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
if (!pProcessor->IsAddNewRowForTrailer(pTrailerLayoutItem)) {
@@ -406,10 +406,10 @@ void AddLeaderAfterSplit(CXFA_ItemLayoutProcessor* pProcessor,
if (pMarginNode) {
fLeftInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::LeftInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fRightInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::RightInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
float fHeight = pLeaderLayoutItem->m_sSize.height;
@@ -984,10 +984,10 @@ bool FindLayoutItemSplitPos(CXFA_ContentLayoutItem* pLayoutItem,
if (pMarginNode && bCalculateMargin) {
fCurTopMargin = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::TopInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fCurBottomMargin = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::BottomInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
bool bChanged = true;
while (bChanged) {
@@ -1087,8 +1087,8 @@ CFX_PointF CalculatePositionedContainerPos(CXFA_Node* pNode,
{2, 5, 8, 1, 4, 7, 0, 3, 6}};
CFX_PointF pos(
- pNode->JSNode()->GetMeasure(XFA_Attribute::X).ToUnit(XFA_UNIT_Pt),
- pNode->JSNode()->GetMeasure(XFA_Attribute::Y).ToUnit(XFA_UNIT_Pt));
+ pNode->JSNode()->GetMeasure(XFA_Attribute::X).ToUnit(XFA_Unit::Pt),
+ pNode->JSNode()->GetMeasure(XFA_Attribute::Y).ToUnit(XFA_Unit::Pt));
int32_t nRotate = FXSYS_round(
pNode->JSNode()->GetMeasure(XFA_Attribute::Rotate).GetValue());
nRotate = XFA_MapRotation(nRotate) / 90;
@@ -1208,10 +1208,10 @@ void CXFA_ItemLayoutProcessor::SplitLayoutItem(
if (pMarginNode && bCalculateMargin) {
fCurTopMargin = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::TopInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fCurBottomMargin = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::BottomInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
CXFA_ContentLayoutItem* pSecondLayoutItem = nullptr;
@@ -1770,10 +1770,10 @@ void CXFA_ItemLayoutProcessor::DoLayoutTableContainer(CXFA_Node* pLayoutNode) {
if (pMarginNode) {
fLeftInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::LeftInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fRightInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::RightInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
float fContentWidthLimit =
@@ -1790,7 +1790,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutTableContainer(CXFA_Node* pLayoutNode) {
continue;
m_rgSpecifiedColumnWidths.push_back(
- CXFA_Measurement(width.AsStringView()).ToUnit(XFA_UNIT_Pt));
+ CXFA_Measurement(width.AsStringView()).ToUnit(XFA_Unit::Pt));
}
}
@@ -2173,16 +2173,16 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer(
if (pMarginNode) {
fLeftInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::LeftInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fTopInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::TopInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fRightInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::RightInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
fBottomInset = pMarginNode->JSNode()
->GetMeasure(XFA_Attribute::BottomInset)
- .ToUnit(XFA_UNIT_Pt);
+ .ToUnit(XFA_Unit::Pt);
}
float fContentWidthLimit =
bContainerWidthAutoSize ? FLT_MAX