Rename GetMargin to GetMarginIfExists
This CL makes it explicit that GetMargin may return a nullptr.
Change-Id: I46780e8df9e966accc38baf56f8aa5149533db87
Reviewed-on: https://pdfium-review.googlesource.com/22675
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp
index 0fc8239..0b1647b 100644
--- a/xfa/fxfa/cxfa_ffarc.cpp
+++ b/xfa/fxfa/cxfa_ffarc.cpp
@@ -24,7 +24,7 @@
return;
CFX_RectF rtArc = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
XFA_RectWithoutMargin(rtArc, margin);
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index 001a3c1..96d7431 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -91,7 +91,7 @@
CXFA_FFWidget::PerformLayout();
float fCheckSize = m_pNode->GetWidgetAcc()->GetCheckButtonSize();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
CFX_RectF rtWidget = GetRectWithoutRotate();
if (margin)
XFA_RectWithoutMargin(rtWidget, margin);
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 5988d5b..cf6c96a 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -170,7 +170,7 @@
void CXFA_FFField::CapPlacement() {
CFX_RectF rtWidget = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin) {
CXFA_LayoutItem* pItem = this;
float fLeftInset = margin->GetLeftInset();
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
index 946defb..a2c21a1 100644
--- a/xfa/fxfa/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -55,7 +55,7 @@
return;
CFX_RectF rtImage = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
XFA_RectWithoutMargin(rtImage, margin);
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index 20f6552..45ff953 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -111,7 +111,7 @@
mtRotate.Concat(matrix);
CFX_RectF rtLine = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
XFA_RectWithoutMargin(rtLine, margin);
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 4bcd155..779fada 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -100,7 +100,7 @@
CFX_RectF rtWidget = GetRectWithoutRotate();
m_rtUI = rtWidget;
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
XFA_RectWithoutMargin(rtWidget, margin);
diff --git a/xfa/fxfa/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
index f3f2a5a..93c4ea2 100644
--- a/xfa/fxfa/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -24,7 +24,7 @@
return;
CFX_RectF rect = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
XFA_RectWithoutMargin(rect, margin);
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index b2ec840..7ae3cb6 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -41,7 +41,7 @@
CFX_RenderDevice* pRenderDevice = pGS->GetRenderDevice();
CFX_RectF rtText = GetRectWithoutRotate();
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin) {
CXFA_LayoutItem* pItem = this;
if (!pItem->GetPrev() && !pItem->GetNext()) {
@@ -86,7 +86,7 @@
pItem = pItem->GetFirst();
while (pItem) {
CFX_RectF rtText = pItem->GetRect(false);
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin) {
if (!pItem->GetPrev())
rtText.height -= margin->GetTopInset();
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 034f591..9f9b29f 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -573,7 +573,7 @@
}
bool CXFA_WidgetAcc::CalculateWidgetAutoSize(CFX_SizeF& size) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin) {
size.width += margin->GetLeftInset() + margin->GetRightInset();
size.height += margin->GetTopInset() + margin->GetBottomInset();
@@ -669,7 +669,7 @@
}
CFX_RectF rtUIMargin = GetUIMargin();
size.width -= rtUIMargin.left + rtUIMargin.width;
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
size.width -= margin->GetLeftInset() + margin->GetRightInset();
@@ -806,7 +806,7 @@
}
float CXFA_WidgetAcc::CalculateWidgetAutoWidth(float fWidthCalc) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
fWidthCalc += margin->GetLeftInset() + margin->GetRightInset();
@@ -822,14 +822,14 @@
}
float CXFA_WidgetAcc::GetWidthWithoutMargin(float fWidthCalc) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
fWidthCalc -= margin->GetLeftInset() + margin->GetRightInset();
return fWidthCalc;
}
float CXFA_WidgetAcc::CalculateWidgetAutoHeight(float fHeightCalc) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
fHeightCalc += margin->GetTopInset() + margin->GetBottomInset();
@@ -845,7 +845,7 @@
}
float CXFA_WidgetAcc::GetHeightWithoutMargin(float fHeightCalc) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin)
fHeightCalc -= margin->GetTopInset() + margin->GetBottomInset();
return fHeightCalc;
@@ -956,7 +956,7 @@
float fTopInset = 0;
float fBottomInset = 0;
if (iBlockIndex == 0) {
- CXFA_Margin* margin = m_pNode->GetMargin();
+ CXFA_Margin* margin = m_pNode->GetMarginIfExists();
if (margin) {
fTopInset = margin->GetTopInset();
fBottomInset = margin->GetBottomInset();
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index d44b203..d2c1e6f 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1572,7 +1572,7 @@
return font ? font->GetColor() : 0xFF000000;
}
-CXFA_Margin* CXFA_Node::GetMargin() const {
+CXFA_Margin* CXFA_Node::GetMarginIfExists() const {
return JSObject()->GetProperty<CXFA_Margin>(0, XFA_Element::Margin);
}
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 69cd12c..1972da9 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -246,7 +246,7 @@
FX_ARGB GetTextColor() const;
float GetLineHeight() const;
- CXFA_Margin* GetMargin() const;
+ CXFA_Margin* GetMarginIfExists() const;
CXFA_Para* GetPara() const;
CXFA_Calculate* GetCalculate() const;
CXFA_Validate* GetValidate() const;
