commit bfeb9343ee794a48b70c2f638c3d74f96e9afab2
author Lei Zhang <thestig@chromium.org> Sat Jul 14 00:07:17 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Jul 14 00:07:17 2018 +0000
tree c098d92551de16bf6fb23bb486cc0151c79c2340
parent cf403ba5720cf8bb05b6fbe9bf2b152c52e7e7b3

Use more ternary operators in content mark code.

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

fpdfsdk/fpdf_editpage.cpp

diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 5a7312d..ded55b9 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -100,13 +100,9 @@
 }
 
 CPDF_Dictionary* GetMarkParamDict(FPDF_PAGEOBJECTMARK mark) {
-  if (!mark)
-    return nullptr;
-
   CPDF_ContentMarkItem* pMarkItem =
       CPDFContentMarkItemFromFPDFPageObjectMark(mark);
-
-  return pMarkItem->GetParam();
+  return pMarkItem ? pMarkItem->GetParam() : nullptr;
 }
 
 CPDF_Dictionary* GetOrCreateMarkParamsDict(FPDF_DOCUMENT document,
@@ -365,10 +361,7 @@
       CPDFContentMarkItemFromFPDFPageObjectMark(mark);
 
   const CPDF_Dictionary* pParams = pMarkItem->GetParam();
-  if (!pParams)
-    return 0;
-
-  return pParams->GetCount();
+  return pParams ? pParams->GetCount() : 0;
 }
 
 FPDF_EXPORT unsigned long FPDF_CALLCONV
@@ -399,10 +392,7 @@
     return FPDF_OBJECT_UNKNOWN;
 
   const CPDF_Object* pObject = pParams->GetObjectFor(key);
-  if (!pObject)
-    return FPDF_OBJECT_UNKNOWN;
-
-  return pObject->GetType();
+  return pObject ? pObject->GetType() : FPDF_OBJECT_UNKNOWN;
 }
 
 FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV