From b5e8f14e3eefc5da995b332788d3203cee204883 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 15:18:35 -0700 Subject: Remove FX_DWORD from core/ and delete definition Review URL: https://codereview.chromium.org/1832173003 --- core/fxge/skia/fx_skia_device.cpp | 18 +++++++++--------- core/fxge/skia/fx_skia_device.h | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'core/fxge/skia') diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index ed6ff82fd0..745c9b50fd 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -317,7 +317,7 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawDeviceText(int nChars, CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, - FX_DWORD color, + uint32_t color, int alpha_flag, void* pIccTransform) { SkAutoTUnref typeface(SkTypeface::CreateFromStream( @@ -430,8 +430,8 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawPath( const CFX_PathData* pPathData, // path info const CFX_Matrix* pObject2Device, // optional transformation const CFX_GraphStateData* pGraphState, // graphic state, for pen attributes - FX_DWORD fill_color, // fill color - FX_DWORD stroke_color, // stroke color + uint32_t fill_color, // fill color + uint32_t stroke_color, // stroke color int fill_mode, // fill mode, WINDING or ALTERNATE. 0 for not filled int alpha_flag, void* pIccTransform, @@ -483,7 +483,7 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawPath( } FX_BOOL CFX_SkiaDeviceDriver::FillRect(const FX_RECT* pRect, - FX_DWORD fill_color, + uint32_t fill_color, int alpha_flag, void* pIccTransform, int blend_type) { @@ -583,7 +583,7 @@ FX_BOOL CFX_SkiaDeviceDriver::GetDIBits(CFX_DIBitmap* pBitmap, } FX_BOOL CFX_SkiaDeviceDriver::SetDIBits(const CFX_DIBSource* pBitmap, - FX_DWORD argb, + uint32_t argb, const FX_RECT* pSrcRect, int left, int top, @@ -596,13 +596,13 @@ FX_BOOL CFX_SkiaDeviceDriver::SetDIBits(const CFX_DIBSource* pBitmap, } FX_BOOL CFX_SkiaDeviceDriver::StretchDIBits(const CFX_DIBSource* pSource, - FX_DWORD argb, + uint32_t argb, int dest_left, int dest_top, int dest_width, int dest_height, const FX_RECT* pClipRect, - FX_DWORD flags, + uint32_t flags, int alpha_flag, void* pIccTransform, int blend_type) { @@ -614,9 +614,9 @@ FX_BOOL CFX_SkiaDeviceDriver::StretchDIBits(const CFX_DIBSource* pSource, FX_BOOL CFX_SkiaDeviceDriver::StartDIBits(const CFX_DIBSource* pSource, int bitmap_alpha, - FX_DWORD argb, + uint32_t argb, const CFX_Matrix* pMatrix, - FX_DWORD render_flags, + uint32_t render_flags, void*& handle, int alpha_flag, void* pIccTransform, diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 8ce7c6c61f..afc505da6e 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -50,15 +50,15 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { FX_BOOL DrawPath(const CFX_PathData* pPathData, const CFX_Matrix* pObject2Device, const CFX_GraphStateData* pGraphState, - FX_DWORD fill_color, - FX_DWORD stroke_color, + uint32_t fill_color, + uint32_t stroke_color, int fill_mode, int alpha_flag = 0, void* pIccTransform = NULL, int blend_type = FXDIB_BLEND_NORMAL) override; FX_BOOL FillRect(const FX_RECT* pRect, - FX_DWORD fill_color, + uint32_t fill_color, int alpha_flag = 0, void* pIccTransform = NULL, int blend_type = FXDIB_BLEND_NORMAL) override; @@ -68,7 +68,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2, - FX_DWORD color, + uint32_t color, int alpha_flag = 0, void* pIccTransform = NULL, int blend_type = FXDIB_BLEND_NORMAL) override { @@ -87,7 +87,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { CFX_DIBitmap* GetBackDrop() override { return m_pAggDriver->GetBackDrop(); } FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, - FX_DWORD color, + uint32_t color, const FX_RECT* pSrcRect, int dest_left, int dest_top, @@ -95,22 +95,22 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { int alpha_flag = 0, void* pIccTransform = NULL) override; FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, - FX_DWORD color, + uint32_t color, int dest_left, int dest_top, int dest_width, int dest_height, const FX_RECT* pClipRect, - FX_DWORD flags, + uint32_t flags, int alpha_flag = 0, void* pIccTransform = NULL, int blend_type = FXDIB_BLEND_NORMAL) override; FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, - FX_DWORD color, + uint32_t color, const CFX_Matrix* pMatrix, - FX_DWORD flags, + uint32_t flags, void*& handle, int alpha_flag = 0, void* pIccTransform = NULL, @@ -124,7 +124,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, - FX_DWORD color, + uint32_t color, int alpha_flag = 0, void* pIccTransform = NULL) override; -- cgit v1.2.3