Rename CXFA_Caption methods for clarity

This CL renames the CXFA_Caption methods to make it clearer they can
return nullptr.

Change-Id: I1b4945fcd2615f16a128709b7fe07e1236a5461a
Reviewed-on: https://pdfium-review.googlesource.com/22743
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 39aa378a52..d61d8989fb 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -510,7 +510,7 @@ void CXFA_WidgetAcc::CalcCaptionSize(CXFA_FFDoc* doc, CFX_SizeF& szCap) {
       bVert ? szCap.height = fCapReserve : szCap.width = fCapReserve;
   } else {
     float fFontSize = 10.0f;
-    CXFA_Font* font = caption->GetFont();
+    CXFA_Font* font = caption->GetFontIfExists();
     if (font) {
       fFontSize = font->GetFontSize();
     } else {
@@ -527,19 +527,20 @@ void CXFA_WidgetAcc::CalcCaptionSize(CXFA_FFDoc* doc, CFX_SizeF& szCap) {
     }
   }
 
-  CXFA_Margin* captionMargin = caption->GetMargin();
-  if (captionMargin) {
-    float fLeftInset = captionMargin->GetLeftInset();
-    float fTopInset = captionMargin->GetTopInset();
-    float fRightInset = captionMargin->GetRightInset();
-    float fBottomInset = captionMargin->GetBottomInset();
-    if (bReserveExit) {
-      bVert ? (szCap.width += fLeftInset + fRightInset)
-            : (szCap.height += fTopInset + fBottomInset);
-    } else {
-      szCap.width += fLeftInset + fRightInset;
-      szCap.height += fTopInset + fBottomInset;
-    }
+  CXFA_Margin* captionMargin = caption->GetMarginIfExists();
+  if (!captionMargin)
+    return;
+
+  float fLeftInset = captionMargin->GetLeftInset();
+  float fTopInset = captionMargin->GetTopInset();
+  float fRightInset = captionMargin->GetRightInset();
+  float fBottomInset = captionMargin->GetBottomInset();
+  if (bReserveExit) {
+    bVert ? (szCap.width += fLeftInset + fRightInset)
+          : (szCap.height += fTopInset + fBottomInset);
+  } else {
+    szCap.width += fLeftInset + fRightInset;
+    szCap.height += fTopInset + fBottomInset;
   }
 }