From b95901091d63ce09accec3088945955f969d46e1 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 27 Apr 2016 06:38:59 -0700 Subject: Remove IFX_SystemHandler. This CL folds IFX_SystemHandler into CFX_SystemHandler. Methods which either had no implementation, or returned a default value have been removed. Review URL: https://codereview.chromium.org/1923093002 --- fpdfsdk/include/fsdk_baseannot.h | 2 +- fpdfsdk/include/fsdk_mgr.h | 8 +-- fpdfsdk/include/fx_systemhandler.h | 106 ------------------------------------- 3 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 fpdfsdk/include/fx_systemhandler.h (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 7a1d3e3c20..cb7d49e789 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -15,8 +15,8 @@ #include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_basic.h" +#include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fx_systemhandler.h" class CPDFSDK_PageView; class CPDF_Annot; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index ff947cccf8..8fbc0d75e9 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,23 +12,23 @@ #include #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" +#include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_actionhandler.h" #include "fpdfsdk/include/fsdk_annothandler.h" #include "fpdfsdk/include/fsdk_baseannot.h" #include "fpdfsdk/include/fsdk_baseform.h" #include "fpdfsdk/include/fsdk_common.h" #include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fx_systemhandler.h" #include "public/fpdf_formfill.h" #include "public/fpdf_fwlevent.h" class CFFL_IFormFiller; +class CFX_SystemHandler; class CPDFSDK_ActionHandler; class CPDFSDK_Annot; class CPDFSDK_InterForm; class CPDFSDK_PageView; class CPDFSDK_Widget; -class IFX_SystemHandler; class IJS_Runtime; // NOTE: |bsUTF16LE| must outlive the use of the result. Care must be taken @@ -437,7 +437,7 @@ class CPDFDoc_Environment final { return m_pUnderlyingDoc; } CFX_ByteString GetAppName() const { return ""; } - IFX_SystemHandler* GetSysHandler() const { return m_pSysHandler.get(); } + CFX_SystemHandler* GetSysHandler() const { return m_pSysHandler.get(); } FPDF_FORMFILLINFO* GetFormFillInfo() const { return m_pInfo; } CFFL_IFormFiller* GetIFormFiller(); // Creates if not present. @@ -453,7 +453,7 @@ class CPDFDoc_Environment final { CPDFSDK_Document* m_pSDKDoc; UnderlyingDocumentType* const m_pUnderlyingDoc; std::unique_ptr m_pIFormFiller; - std::unique_ptr m_pSysHandler; + std::unique_ptr m_pSysHandler; }; class CPDFSDK_Document { diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h deleted file mode 100644 index dc225df0a2..0000000000 --- a/fpdfsdk/include/fx_systemhandler.h +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_ -#define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_ - -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" - -class CPDF_Document; -class CPDF_Font; - -typedef void* FX_HWND; -typedef void* FX_HMENU; -typedef void (*TimerCallback)(int32_t idEvent); - -struct FX_SYSTEMTIME { - FX_SYSTEMTIME() - : wYear(0), - wMonth(0), - wDayOfWeek(0), - wDay(0), - wHour(0), - wMinute(0), - wSecond(0), - wMilliseconds(0) {} - uint16_t wYear; - uint16_t wMonth; - uint16_t wDayOfWeek; - uint16_t wDay; - uint16_t wHour; - uint16_t wMinute; - uint16_t wSecond; - uint16_t wMilliseconds; -}; - -// cursor style -#define FXCT_ARROW 0 -#define FXCT_NESW 1 -#define FXCT_NWSE 2 -#define FXCT_VBEAM 3 -#define FXCT_HBEAM 4 -#define FXCT_HAND 5 - -class IFX_SystemHandler { - public: - virtual ~IFX_SystemHandler() {} - virtual void InvalidateRect(FX_HWND hWnd, FX_RECT rect) = 0; - virtual void OutputSelectedRect(void* pFormFiller, CFX_FloatRect& rect) = 0; - - virtual FX_BOOL IsSelectionImplemented() = 0; - - virtual CFX_WideString GetClipboardText(FX_HWND hWnd) = 0; - virtual FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString str) = 0; - - virtual void ClientToScreen(FX_HWND hWnd, int32_t& x, int32_t& y) = 0; - virtual void ScreenToClient(FX_HWND hWnd, int32_t& x, int32_t& y) = 0; - - /*cursor style - FXCT_ARROW - FXCT_NESW - FXCT_NWSE - FXCT_VBEAM - FXCT_HBEAM - FXCT_HAND - */ - virtual void SetCursor(int32_t nCursorType) = 0; - - virtual FX_HMENU CreatePopupMenu() = 0; - virtual FX_BOOL AppendMenuItem(FX_HMENU hMenu, - int32_t nIDNewItem, - CFX_WideString str) = 0; - virtual FX_BOOL EnableMenuItem(FX_HMENU hMenu, - int32_t nIDItem, - FX_BOOL bEnabled) = 0; - virtual int32_t TrackPopupMenu(FX_HMENU hMenu, - int32_t x, - int32_t y, - FX_HWND hParent) = 0; - virtual void DestroyMenu(FX_HMENU hMenu) = 0; - - virtual CFX_ByteString GetNativeTrueTypeFont(int32_t nCharset) = 0; - virtual FX_BOOL FindNativeTrueTypeFont(int32_t nCharset, - CFX_ByteString sFontFaceName) = 0; - virtual CPDF_Font* AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, - CFX_ByteString sFontFaceName, - uint8_t nCharset) = 0; - - virtual int32_t SetTimer(int32_t uElapse, TimerCallback lpTimerFunc) = 0; - virtual void KillTimer(int32_t nID) = 0; - - virtual FX_BOOL IsSHIFTKeyDown(uint32_t nFlag) = 0; - virtual FX_BOOL IsCTRLKeyDown(uint32_t nFlag) = 0; - virtual FX_BOOL IsALTKeyDown(uint32_t nFlag) = 0; - virtual FX_BOOL IsINSERTKeyDown(uint32_t nFlag) = 0; - - virtual FX_SYSTEMTIME GetLocalTime() = 0; - - virtual int32_t GetCharSet() = 0; - virtual void SetCharSet(int32_t nCharSet) = 0; -}; - -#endif // FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_ -- cgit v1.2.3