From 468e5896007c7fe7bb283c0161d807a76f403308 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 13 Oct 2015 15:49:36 -0700 Subject: Changes to XFA to more closely match master. These files should change in XFA in order to reduce the number of "noise diffs" between master and XFA as seen in https://codereview.chromium.org/1399273003/ These include: blank lines and missed merges: 3c012fe else-after-returns (partial) fb07e28 Tidy up CPDFDOC_Environment (partial, consts missing). 624b166 Allow FPDFBookmark_GetFirstChild to return the top level bookmark R=thestig@chromium.org Review URL: https://codereview.chromium.org/1403063003 . --- fpdfsdk/include/fsdk_mgr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/include/fsdk_mgr.h') diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index aceb40fa3c..01579dcc7a 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -77,7 +77,7 @@ class CPDFDoc_Environment final { m_pInfo->FFI_KillTimer(m_pInfo, nTimerID); } - FX_SYSTEMTIME FFI_GetLocalTime() { + FX_SYSTEMTIME FFI_GetLocalTime() const { FX_SYSTEMTIME fxtime; if (m_pInfo && m_pInfo->FFI_GetLocalTime) { FPDF_SYSTEMTIME systime = m_pInfo->FFI_GetLocalTime(m_pInfo); @@ -98,19 +98,19 @@ class CPDFDoc_Environment final { m_pInfo->FFI_OnChange(m_pInfo); } - FX_BOOL FFI_IsSHIFTKeyDown(FX_DWORD nFlag) { + FX_BOOL FFI_IsSHIFTKeyDown(FX_DWORD nFlag) const { return (nFlag & FWL_EVENTFLAG_ShiftKey) != 0; } - FX_BOOL FFI_IsCTRLKeyDown(FX_DWORD nFlag) { + FX_BOOL FFI_IsCTRLKeyDown(FX_DWORD nFlag) const { return (nFlag & FWL_EVENTFLAG_ControlKey) != 0; } - FX_BOOL FFI_IsALTKeyDown(FX_DWORD nFlag) { + FX_BOOL FFI_IsALTKeyDown(FX_DWORD nFlag) const { return (nFlag & FWL_EVENTFLAG_AltKey) != 0; } - FX_BOOL FFI_IsINSERTKeyDown(FX_DWORD nFlag) { return FALSE; } + FX_BOOL FFI_IsINSERTKeyDown(FX_DWORD nFlag) const { return FALSE; } int JS_appAlert(const FX_WCHAR* Msg, const FX_WCHAR* Title, -- cgit v1.2.3