summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-25 16:41:00 -0800
committerLei Zhang <thestig@chromium.org>2016-01-25 16:41:00 -0800
commite56b3ad57573c677ad84bf4a2ffd649d6134b990 (patch)
tree09ec0d682b36266c745e6262281e9e35dcefbfa5 /fpdfsdk
parentc64e4007ee4561ec2ed3ce986191caf9b024ef55 (diff)
downloadpdfium-e56b3ad57573c677ad84bf4a2ffd649d6134b990.tar.xz
Fix a bunch of pointless returns.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1637693002 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/src/fsdk_annothandler.cpp8
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp6
2 files changed, 3 insertions, 11 deletions
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index feaee74428..a8dff91fd2 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -205,10 +205,8 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseEnter(CPDFSDK_PageView* pPageView,
FX_DWORD nFlag) {
ASSERT(pAnnot);
- if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
+ if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
pAnnotHandler->OnMouseEnter(pPageView, pAnnot, nFlag);
- }
- return;
}
void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView,
@@ -216,10 +214,8 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView,
FX_DWORD nFlag) {
ASSERT(pAnnot);
- if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
+ if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
pAnnotHandler->OnMouseExit(pPageView, pAnnot, nFlag);
- }
- return;
}
FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChar(CPDFSDK_Annot* pAnnot,
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 9540c5766d..aa9c0459b5 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -957,8 +957,6 @@ void CPDFSDK_BAAnnot::Annot_OnDraw(CFX_RenderDevice* pDevice,
m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal);
m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
CPDF_Annot::Normal, NULL);
-
- return;
}
UnderlyingPageType* CPDFSDK_Annot::GetUnderlyingPage() {
@@ -966,7 +964,5 @@ UnderlyingPageType* CPDFSDK_Annot::GetUnderlyingPage() {
}
CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
- if (m_pPageView)
- return m_pPageView->GetPDFPage();
- return NULL;
+ return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
}