From befa4506dc9d2a679c526aff96c09bcb0e9daecb Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 26 May 2016 20:15:19 -0700 Subject: Remove default arguments from CFX_FxgeDevice. Remove unused dithering code. Review-Url: https://codereview.chromium.org/2010813003 --- core/fxge/include/fx_dib.h | 11 ++++------- core/fxge/include/fx_ge.h | 12 ++++-------- 2 files changed, 8 insertions(+), 15 deletions(-) (limited to 'core/fxge/include') diff --git a/core/fxge/include/fx_dib.h b/core/fxge/include/fx_dib.h index 6504e5fd8f..12ed03c1d3 100644 --- a/core/fxge/include/fx_dib.h +++ b/core/fxge/include/fx_dib.h @@ -256,6 +256,7 @@ class CFX_DIBSource { int FindPalette(uint32_t color) const; void GetPalette(uint32_t* pal, int alpha) const; }; + class CFX_DIBitmap : public CFX_DIBSource { public: CFX_DIBitmap(); @@ -357,17 +358,13 @@ class CFX_DIBitmap : public CFX_DIBSource { FX_BOOL ConvertColorScale(uint32_t forecolor, uint32_t backcolor); - FX_BOOL DitherFS(const uint32_t* pPalette, - int pal_size, - const FX_RECT* pRect = NULL); - protected: - uint8_t* m_pBuffer; + FX_BOOL GetGrayData(void* pIccTransform = NULL); + uint8_t* m_pBuffer; FX_BOOL m_bExtBuf; - - FX_BOOL GetGrayData(void* pIccTransform = NULL); }; + class CFX_DIBExtractor { public: CFX_DIBExtractor(const CFX_DIBSource* pSrc); diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h index c025c1251e..6a3113d070 100644 --- a/core/fxge/include/fx_ge.h +++ b/core/fxge/include/fx_ge.h @@ -161,7 +161,6 @@ class CFX_GraphStateData { #define FXDC_HORZ_SIZE 5 #define FXDC_VERT_SIZE 6 #define FXDC_RENDER_CAPS 7 -#define FXDC_DITHER_BITS 8 #define FXDC_DISPLAY 1 #define FXDC_PRINTER 2 #define FXRC_GET_BITS 0x01 @@ -402,16 +401,13 @@ class CFX_FxgeDevice : public CFX_RenderDevice { ~CFX_FxgeDevice() override; bool Attach(CFX_DIBitmap* pBitmap, - int dither_bits = 0, - bool bRgbByteOrder = false, - CFX_DIBitmap* pOriDevice = NULL, - bool bGroupKnockout = false); - + bool bRgbByteOrder, + CFX_DIBitmap* pOriDevice, + bool bGroupKnockout); bool Create(int width, int height, FXDIB_Format format, - int dither_bits = 0, - CFX_DIBitmap* pOriDevice = NULL); + CFX_DIBitmap* pOriDevice); #ifdef _SKIA_SUPPORT_ bool AttachRecorder(SkPictureRecorder* recorder); -- cgit v1.2.3