diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-25 19:02:50 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-25 19:02:50 +0000 |
| commit | 0c327657fb8c23934c5beae520e7a97a48e2eef6 (patch) | |
| tree | 75c5749124f32c464d29149e125e47325f0cbd2d /core/fxge/dib/cfx_bitmapcomposer.cpp | |
| parent | 94f45b29897f801151ecd085fa083f84558065ee (diff) | |
| download | pdfium-0c327657fb8c23934c5beae520e7a97a48e2eef6.tar.xz | |
Change FXDIB_BLEND_FOO typedefs to an enum class.
BUG=pdfium:1085
Change-Id: Ieb43d4588e1d689e327e428dcbbf7adba45ce178
Reviewed-on: https://pdfium-review.googlesource.com/c/44545
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxge/dib/cfx_bitmapcomposer.cpp')
| -rw-r--r-- | core/fxge/dib/cfx_bitmapcomposer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/dib/cfx_bitmapcomposer.cpp index 22e1bc9b65..000ad91099 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.cpp +++ b/core/fxge/dib/cfx_bitmapcomposer.cpp @@ -9,10 +9,9 @@ #include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_dibitmap.h" -CFX_BitmapComposer::CFX_BitmapComposer() - : m_bRgbByteOrder(false), m_BlendType(FXDIB_BLEND_NORMAL) {} +CFX_BitmapComposer::CFX_BitmapComposer() = default; -CFX_BitmapComposer::~CFX_BitmapComposer() {} +CFX_BitmapComposer::~CFX_BitmapComposer() = default; void CFX_BitmapComposer::Compose(const RetainPtr<CFX_DIBitmap>& pDest, const CFX_ClipRgn* pClipRgn, @@ -24,7 +23,7 @@ void CFX_BitmapComposer::Compose(const RetainPtr<CFX_DIBitmap>& pDest, bool bFlipY, bool bRgbByteOrder, int alpha_flag, - int blend_type) { + BlendMode blend_type) { m_pBitmap = pDest; m_pClipRgn = pClipRgn; m_DestLeft = dest_rect.left; @@ -50,7 +49,7 @@ bool CFX_BitmapComposer::SetInfo(int width, uint32_t* pSrcPalette) { m_SrcFormat = src_format; if (!m_Compositor.Init(m_pBitmap->GetFormat(), src_format, width, pSrcPalette, - m_MaskColor, FXDIB_BLEND_NORMAL, + m_MaskColor, BlendMode::kNormal, m_pClipMask != nullptr || (m_BitmapAlpha < 255), m_bRgbByteOrder, m_AlphaFlag)) { return false; |