From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- core/src/fxge/skia/fx_skia_blitter_new.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fxge/skia/fx_skia_blitter_new.h') diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h index e60c6398d2..cd411da9f5 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.h +++ b/core/src/fxge/skia/fx_skia_blitter_new.h @@ -15,9 +15,9 @@ protected: m_Blue, // Yellow m_Gray; // Black FX_DWORD m_Color; // FX_ARGB or FX_CMYK - FX_BOOL m_bFullCover; + bool m_bFullCover; int m_ProcessFilter; - FX_BOOL m_bRgbByteOrder; + bool m_bRgbByteOrder; FX_RECT m_ClipBox; CFX_DIBitmap* m_pDevice; @@ -205,7 +205,7 @@ public: //-------------------------------------------------------------------- - FX_BOOL Init(CFX_DIBitmap* pDevice, CFX_DIBitmap* pOriDevice, const CFX_ClipRgn* pClipRgn, FX_DWORD color, FX_BOOL bFullCover, FX_BOOL bRgbByteOrder, + bool Init(CFX_DIBitmap* pDevice, CFX_DIBitmap* pOriDevice, const CFX_ClipRgn* pClipRgn, FX_DWORD color, bool bFullCover, bool bRgbByteOrder, int alpha_flag = 0, void* pIccTransform = NULL); //The alpha flag must be fill_flag if exist. }; class CFX_SkiaA8Renderer : public SkBlitter @@ -218,7 +218,7 @@ public: virtual void blitRect(int x, int y, int width, int height); virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha); //-------------------------------------------------------------------- - FX_BOOL Init(CFX_DIBitmap* pDevice, int Left, int Top); + bool Init(CFX_DIBitmap* pDevice, int Left, int Top); CFX_DIBitmap* m_pDevice; int m_Left; int m_Top; -- cgit v1.2.3