Remove _FWL_RETURN_IF_ macros

These hide early returns from the casual reader, hide
the inversion of the condition under test from the reader,
prevent the folding of conditions into a single statement,
and take up more characters than the if() itself.

R=ochang@chromium.org

Review URL: https://codereview.chromium.org/1494683002 .

1 files changed, 8 insertions, 4 deletions

diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp
index 6430176526..8793e411ca 100644
--- a/xfa/src/fwl/src/core/fwl_timerimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp
@@ -12,17 +12,21 @@ FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer,
                           FX_DWORD dwElapse,

                           FX_BOOL bImmediately) {

   IFWL_AdapterNative* pAdapterNative = FWL_GetAdapterNative();

-  _FWL_RETURN_VALUE_IF_FAIL(pAdapterNative, NULL);

+  if (!pAdapterNative)

+    return NULL;

   IFWL_AdapterTimerMgr* pAdapterTimerMgr = pAdapterNative->GetTimerMgr();

-  _FWL_RETURN_VALUE_IF_FAIL(pAdapterTimerMgr, NULL);

+  if (!pAdapterTimerMgr)

+    return NULL;

   FWL_HTIMER hTimer = NULL;

   pAdapterTimerMgr->Start(pTimer, dwElapse, hTimer, bImmediately);

   return hTimer;

 }

 int32_t FWL_StopTimer(FWL_HTIMER hTimer) {

   IFWL_AdapterNative* pAdapterNative = FWL_GetAdapterNative();

-  _FWL_RETURN_VALUE_IF_FAIL(pAdapterNative, FWL_ERR_Indefinite);

+  if (!pAdapterNative)

+    return FWL_ERR_Indefinite;

   IFWL_AdapterTimerMgr* pAdapterTimerMgr = pAdapterNative->GetTimerMgr();

-  _FWL_RETURN_VALUE_IF_FAIL(pAdapterTimerMgr, FWL_ERR_Indefinite);

+  if (!pAdapterTimerMgr)

+    return FWL_ERR_Indefinite;

   return pAdapterTimerMgr->Stop(hTimer);

 }