summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2018-05-01 22:26:44 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-01 22:26:44 +0000
commitc9cd2874278e5395a150d8ad08f44bc738bce6be (patch)
tree7ba4f86d5d913cc0b6ae8dc37f78fa1e82cadb8c /xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
parent2e118e8f73f939fa93d144470e7fa31228e7e74d (diff)
downloadpdfium-c9cd2874278e5395a150d8ad08f44bc738bce6be.tar.xz
Transform float out params from reference to pointer in CXFA_Node.
Change-Id: I4039917c5342f6a4c6568029a293066901bb5db4 Reviewed-on: https://pdfium-review.googlesource.com/31870 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
index e9843fbf99..7273adf337 100644
--- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
@@ -60,24 +60,24 @@ std::vector<WideString> SeparateStringW(const wchar_t* pStr,
}
void UpdateWidgetSize(CXFA_ContentLayoutItem* pLayoutItem,
- float* fWidth,
- float* fHeight) {
+ float* pWidth,
+ float* pHeight) {
CXFA_Node* pNode = pLayoutItem->m_pFormNode;
switch (pNode->GetElementType()) {
case XFA_Element::Subform:
case XFA_Element::Area:
case XFA_Element::ExclGroup:
case XFA_Element::SubformSet: {
- if (*fWidth < -XFA_LAYOUT_FLOAT_PERCISION)
- *fWidth = pLayoutItem->m_sSize.width;
- if (*fHeight < -XFA_LAYOUT_FLOAT_PERCISION)
- *fHeight = pLayoutItem->m_sSize.height;
+ if (*pWidth < -XFA_LAYOUT_FLOAT_PERCISION)
+ *pWidth = pLayoutItem->m_sSize.width;
+ if (*pHeight < -XFA_LAYOUT_FLOAT_PERCISION)
+ *pHeight = pLayoutItem->m_sSize.height;
break;
}
case XFA_Element::Draw:
case XFA_Element::Field: {
- pNode->GetDocument()->GetNotify()->StartFieldDrawLayout(pNode, *fWidth,
- *fHeight);
+ pNode->GetDocument()->GetNotify()->StartFieldDrawLayout(pNode, pWidth,
+ pHeight);
break;
}
default:
@@ -494,7 +494,7 @@ bool FindLayoutItemSplitPos(CXFA_ContentLayoutItem* pLayoutItem,
{
float fRelSplitPos = *fProposedSplitPos - fCurVerticalOffset;
if (pFormNode->FindSplitPos(pNotify->GetHDOC()->GetDocView(),
- pLayoutItem->GetIndex(), fRelSplitPos)) {
+ pLayoutItem->GetIndex(), &fRelSplitPos)) {
bAnyChanged = true;
bChanged = true;
*fProposedSplitPos = fCurVerticalOffset + fRelSplitPos;
@@ -2187,7 +2187,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutField() {
CXFA_Document* pDocument = m_pFormNode->GetDocument();
CXFA_FFNotify* pNotify = pDocument->GetNotify();
CFX_SizeF size(-1, -1);
- pNotify->StartFieldDrawLayout(m_pFormNode, size.width, size.height);
+ pNotify->StartFieldDrawLayout(m_pFormNode, &size.width, &size.height);
int32_t nRotate = XFA_MapRotation(
m_pFormNode->JSObject()->GetInteger(XFA_Attribute::Rotate));