Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1857)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fxge/win32/win32_int.h

Issue 2477443002: Remove FX_BOOL from core (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxge/win32/fx_win32_print.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/win32/win32_int.h
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 1f2bc50f4258eb83ab6125703989467c075d69d2..fa1cc6830e659fd2632fe1bb96fb52fcde42d340 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -27,48 +27,48 @@ class CGdiplusExt {
CGdiplusExt();
~CGdiplusExt();
void Load();
- FX_BOOL IsAvailable() { return !!m_hModule; }
- FX_BOOL StretchBitMask(HDC hDC,
- BOOL bMonoDevice,
- const CFX_DIBitmap* pBitmap,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- uint32_t argb,
- const FX_RECT* pClipRect,
- int flags);
- FX_BOOL StretchDIBits(HDC hDC,
- const CFX_DIBitmap* pBitmap,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- const FX_RECT* pClipRect,
- int flags);
- FX_BOOL DrawPath(HDC hDC,
- const CFX_PathData* pPathData,
- const CFX_Matrix* pObject2Device,
- const CFX_GraphStateData* pGraphState,
- uint32_t fill_argb,
- uint32_t stroke_argb,
- int fill_mode);
+ bool IsAvailable() { return !!m_hModule; }
+ bool StretchBitMask(HDC hDC,
+ BOOL bMonoDevice,
+ const CFX_DIBitmap* pBitmap,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ uint32_t argb,
+ const FX_RECT* pClipRect,
+ int flags);
+ bool StretchDIBits(HDC hDC,
+ const CFX_DIBitmap* pBitmap,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ const FX_RECT* pClipRect,
+ int flags);
+ bool DrawPath(HDC hDC,
+ const CFX_PathData* pPathData,
+ const CFX_Matrix* pObject2Device,
+ const CFX_GraphStateData* pGraphState,
+ uint32_t fill_argb,
+ uint32_t stroke_argb,
+ int fill_mode);
void* LoadMemFont(uint8_t* pData, uint32_t size);
void DeleteMemFont(void* pFontCollection);
- FX_BOOL GdipCreateFromImage(void* bitmap, void** graphics);
+ bool GdipCreateFromImage(void* bitmap, void** graphics);
void GdipDeleteGraphics(void* graphics);
void GdipSetTextRenderingHint(void* graphics, int mode);
void GdipSetPageUnit(void* graphics, uint32_t unit);
void GdipSetWorldTransform(void* graphics, void* pMatrix);
- FX_BOOL GdipDrawDriverString(void* graphics,
- unsigned short* text,
- int length,
- void* font,
- void* brush,
- void* positions,
- int flags,
- const void* matrix);
+ bool GdipDrawDriverString(void* graphics,
+ unsigned short* text,
+ int length,
+ void* font,
+ void* brush,
+ void* positions,
+ int flags,
+ const void* matrix);
void GdipCreateBrush(uint32_t fill_argb, void** pBrush);
void GdipDeleteBrush(void* pBrush);
void GdipCreateMatrix(FX_FLOAT a,
@@ -79,27 +79,27 @@ class CGdiplusExt {
FX_FLOAT f,
void** matrix);
void GdipDeleteMatrix(void* matrix);
- FX_BOOL GdipCreateFontFamilyFromName(const FX_WCHAR* name,
- void* pFontCollection,
- void** pFamily);
+ bool GdipCreateFontFamilyFromName(const FX_WCHAR* name,
+ void* pFontCollection,
+ void** pFamily);
void GdipDeleteFontFamily(void* pFamily);
- FX_BOOL GdipCreateFontFromFamily(void* pFamily,
- FX_FLOAT font_size,
- int fontstyle,
- int flag,
- void** pFont);
+ bool GdipCreateFontFromFamily(void* pFamily,
+ FX_FLOAT font_size,
+ int fontstyle,
+ int flag,
+ void** pFont);
void* GdipCreateFontFromCollection(void* pFontCollection,
FX_FLOAT font_size,
int fontstyle);
void GdipDeleteFont(void* pFont);
- FX_BOOL GdipCreateBitmap(CFX_DIBitmap* pBitmap, void** bitmap);
+ bool GdipCreateBitmap(CFX_DIBitmap* pBitmap, void** bitmap);
void GdipDisposeImage(void* bitmap);
void GdipGetFontSize(void* pFont, FX_FLOAT* size);
void* GdiAddFontMemResourceEx(void* pFontdata,
uint32_t size,
void* pdv,
uint32_t* num_face);
- FX_BOOL GdiRemoveFontMemResourceEx(void* handle);
+ bool GdiRemoveFontMemResourceEx(void* handle);
CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args);
FARPROC m_Functions[100];
@@ -113,7 +113,7 @@ class CGdiplusExt {
class CWin32Platform {
public:
- FX_BOOL m_bHalfTone;
+ bool m_bHalfTone;
CGdiplusExt m_GdiplusExt;
CDWriteExt m_DWriteExt;
};
@@ -127,29 +127,29 @@ class CGdiDeviceDriver : public IFX_RenderDeviceDriver {
int GetDeviceCaps(int caps_id) const override;
void SaveState() override;
void RestoreState(bool bKeepSaved) override;
- FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData,
- const CFX_Matrix* pObject2Device,
- int fill_mode) override;
- FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData,
- const CFX_Matrix* pObject2Device,
- const CFX_GraphStateData* pGraphState) override;
- FX_BOOL DrawPath(const CFX_PathData* pPathData,
- const CFX_Matrix* pObject2Device,
- const CFX_GraphStateData* pGraphState,
- uint32_t fill_color,
- uint32_t stroke_color,
- int fill_mode,
- int blend_type) override;
- FX_BOOL FillRectWithBlend(const FX_RECT* pRect,
- uint32_t fill_color,
- int blend_type) override;
- FX_BOOL DrawCosmeticLine(FX_FLOAT x1,
- FX_FLOAT y1,
- FX_FLOAT x2,
- FX_FLOAT y2,
- uint32_t color,
- int blend_type) override;
- FX_BOOL GetClipBox(FX_RECT* pRect) override;
+ bool SetClip_PathFill(const CFX_PathData* pPathData,
+ const CFX_Matrix* pObject2Device,
+ int fill_mode) override;
+ bool SetClip_PathStroke(const CFX_PathData* pPathData,
+ const CFX_Matrix* pObject2Device,
+ const CFX_GraphStateData* pGraphState) override;
+ bool DrawPath(const CFX_PathData* pPathData,
+ const CFX_Matrix* pObject2Device,
+ const CFX_GraphStateData* pGraphState,
+ uint32_t fill_color,
+ uint32_t stroke_color,
+ int fill_mode,
+ int blend_type) override;
+ bool FillRectWithBlend(const FX_RECT* pRect,
+ uint32_t fill_color,
+ int blend_type) override;
+ bool DrawCosmeticLine(FX_FLOAT x1,
+ FX_FLOAT y1,
+ FX_FLOAT x2,
+ FX_FLOAT y2,
+ uint32_t color,
+ int blend_type) override;
+ bool GetClipBox(FX_RECT* pRect) override;
void* GetPlatformSurface() const override;
void DrawLine(FX_FLOAT x1,
@@ -158,23 +158,23 @@ class CGdiDeviceDriver : public IFX_RenderDeviceDriver {
FX_FLOAT y2,
const CFX_Matrix* pMatrix);
- FX_BOOL GDI_SetDIBits(CFX_DIBitmap* pBitmap,
- const FX_RECT* pSrcRect,
- int left,
- int top);
- FX_BOOL GDI_StretchDIBits(CFX_DIBitmap* pBitmap,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- uint32_t flags);
- FX_BOOL GDI_StretchBitMask(CFX_DIBitmap* pBitmap,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- uint32_t bitmap_color,
- uint32_t flags);
+ bool GDI_SetDIBits(CFX_DIBitmap* pBitmap,
+ const FX_RECT* pSrcRect,
+ int left,
+ int top);
+ bool GDI_StretchDIBits(CFX_DIBitmap* pBitmap,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ uint32_t flags);
+ bool GDI_StretchBitMask(CFX_DIBitmap* pBitmap,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ uint32_t bitmap_color,
+ uint32_t flags);
HDC m_hDC;
int m_Width;
@@ -190,37 +190,37 @@ class CGdiDisplayDriver : public CGdiDeviceDriver {
~CGdiDisplayDriver() override;
protected:
- FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
- FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
- uint32_t color,
- const FX_RECT* pSrcRect,
- int left,
- int top,
- int blend_type) override;
- FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
- uint32_t color,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- const FX_RECT* pClipRect,
- uint32_t flags,
- int blend_type) override;
- FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
- int bitmap_alpha,
- uint32_t color,
- const CFX_Matrix* pMatrix,
- uint32_t render_flags,
- void*& handle,
- int blend_type) override;
- FX_BOOL UseFoxitStretchEngine(const CFX_DIBSource* pSource,
- uint32_t color,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- const FX_RECT* pClipRect,
- int render_flags);
+ bool GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
+ bool SetDIBits(const CFX_DIBSource* pBitmap,
+ uint32_t color,
+ const FX_RECT* pSrcRect,
+ int left,
+ int top,
+ int blend_type) override;
+ bool StretchDIBits(const CFX_DIBSource* pBitmap,
+ uint32_t color,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ const FX_RECT* pClipRect,
+ uint32_t flags,
+ int blend_type) override;
+ bool StartDIBits(const CFX_DIBSource* pBitmap,
+ int bitmap_alpha,
+ uint32_t color,
+ const CFX_Matrix* pMatrix,
+ uint32_t render_flags,
+ void*& handle,
+ int blend_type) override;
+ bool UseFoxitStretchEngine(const CFX_DIBSource* pSource,
+ uint32_t color,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ const FX_RECT* pClipRect,
+ int render_flags);
};
class CGdiPrinterDriver : public CGdiDeviceDriver {
@@ -230,34 +230,34 @@ class CGdiPrinterDriver : public CGdiDeviceDriver {
protected:
int GetDeviceCaps(int caps_id) const override;
- FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
- uint32_t color,
- const FX_RECT* pSrcRect,
- int left,
- int top,
- int blend_type) override;
- FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
- uint32_t color,
- int dest_left,
- int dest_top,
- int dest_width,
- int dest_height,
- const FX_RECT* pClipRect,
- uint32_t flags,
- int blend_type) override;
- FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
- int bitmap_alpha,
- uint32_t color,
- const CFX_Matrix* pMatrix,
- uint32_t render_flags,
- void*& handle,
- int blend_type) override;
- FX_BOOL DrawDeviceText(int nChars,
- const FXTEXT_CHARPOS* pCharPos,
- CFX_Font* pFont,
- const CFX_Matrix* pObject2Device,
- FX_FLOAT font_size,
- uint32_t color) override;
+ bool SetDIBits(const CFX_DIBSource* pBitmap,
+ uint32_t color,
+ const FX_RECT* pSrcRect,
+ int left,
+ int top,
+ int blend_type) override;
+ bool StretchDIBits(const CFX_DIBSource* pBitmap,
+ uint32_t color,
+ int dest_left,
+ int dest_top,
+ int dest_width,
+ int dest_height,
+ const FX_RECT* pClipRect,
+ uint32_t flags,
+ int blend_type) override;
+ bool StartDIBits(const CFX_DIBSource* pBitmap,
+ int bitmap_alpha,
+ uint32_t color,
+ const CFX_Matrix* pMatrix,
+ uint32_t render_flags,
+ void*& handle,
+ int blend_type) override;
+ bool DrawDeviceText(int nChars,
+ const FXTEXT_CHARPOS* pCharPos,
+ CFX_Font* pFont,
+ const CFX_Matrix* pObject2Device,
+ FX_FLOAT font_size,
+ uint32_t color) override;
const int m_HorzSize;
const int m_VertSize;
« no previous file with comments | « core/fxge/win32/fx_win32_print.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698