From d5e7b355b8c4c22ff770547797cbc536bdc95d5b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 29 Feb 2016 11:24:29 -0800 Subject: Fixup FX_RECT and FX_SMALL_RECT classes. Put these first, so later on more complicated classes can have constructors that take these as arguments. Add better constructors, and call appropriately. Also don't be afraid to return these from methods since RVO. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1745683002 . --- fpdfsdk/src/fsdk_annothandler.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index 28b8114ed6..27e5e2352a 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -701,12 +701,8 @@ FX_BOOL CPDFSDK_BFAnnotHandler::OnKillFocus(CPDFSDK_Annot* pAnnot, CFX_FloatRect CPDFSDK_BFAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot) { CFX_ByteString sSubType = pAnnot->GetSubType(); - - if (sSubType == BFFT_SIGNATURE) { - } else { - if (m_pFormFiller) - return m_pFormFiller->GetViewBBox(pPageView, pAnnot); - } + if (sSubType != BFFT_SIGNATURE && m_pFormFiller) + return CFX_FloatRect(m_pFormFiller->GetViewBBox(pPageView, pAnnot)); return CFX_FloatRect(0, 0, 0, 0); } -- cgit v1.2.3