From e3db14f4d0e11ed30bd7e014ffa8cea9d6fb93ad Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 15 Jul 2015 15:30:18 -0700 Subject: Kill Func_Renderpage global function pointer, it never changes. Kill some unused macros along the way, and put prototypes in header files. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1233203004 . --- fpdfsdk/include/fsdk_define.h | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) (limited to 'fpdfsdk/include/fsdk_define.h') diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index f809043417..29b265a428 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -7,11 +7,6 @@ #ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ -#ifdef _WIN32 -#include -#include -#endif - #include "../../core/include/fpdfapi/fpdf_module.h" #include "../../core/include/fpdfapi/fpdf_pageobj.h" #include "../../core/include/fpdfapi/fpdf_parser.h" @@ -23,26 +18,11 @@ #include "../../core/include/fpdfdoc/fpdf_vt.h" #include "../../core/include/fxge/fx_ge.h" #include "../../core/include/fxge/fx_ge_win32.h" +#include "../../public/fpdfview.h" - -#ifndef FX_GetAValue -/** @brief It retrieves an intensity value for the alpha component of a #FX_ARGB value. */ -#define FX_GetAValue(argb) ((argb & 0xFF000000) >> 24) -#endif - -#ifndef FX_GetRValue -/** @brief It retrieves an intensity value for the red component of a #FX_ARGB value. */ -#define FX_GetRValue(argb) ((argb & 0x00FF0000) >> 16) -#endif - -#ifndef FX_GetGValue -/** @brief It retrieves an intensity value for the green component of a #FX_ARGB value. */ -#define FX_GetGValue(argb) ((argb & 0x0000FF00) >> 8) -#endif - -#ifndef FX_GetBValue -/** @brief It retrieves an intensity value for the blue component of a #FX_ARGB value. */ -#define FX_GetBValue(argb) (argb & 0x000000FF) +#ifdef _WIN32 +#include +#include #endif #ifndef FX_ARGBTOCOLORREF @@ -56,8 +36,8 @@ #endif typedef unsigned int FX_UINT; - -#include "../../public/fpdfview.h" +class CRenderContext; +class IFSDK_PAUSE_Adapter; class CPDF_CustomAccess final : public IFX_FileRead { @@ -75,8 +55,12 @@ private: FPDF_FILEACCESS m_FileAccess; }; -void FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable); -FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy); - +void DropContext(void* data); +void FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable); +FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy); +void FPDF_RenderPage_Retail(CRenderContext* pContext, FPDF_PAGE page, + int start_x, int start_y, int size_x, int size_y, + int rotate, int flags, FX_BOOL bNeedToRestore, + IFSDK_PAUSE_Adapter* pause); #endif // FPDFSDK_INCLUDE_FSDK_DEFINE_H_ -- cgit v1.2.3