diff options
| author | thestig <thestig@chromium.org> | 2016-05-26 11:04:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-26 11:04:40 -0700 |
| commit | d3e354a43531eaed87e43d9ff2df4525186ea28d (patch) | |
| tree | fe4ddb4219e7027f200eb240f18fdabfd70a9a4c /xfa/fxfa/app | |
| parent | 41846a0fcc7d98476a18ec6c97778ead58069d99 (diff) | |
| download | pdfium-d3e354a43531eaed87e43d9ff2df4525186ea28d.tar.xz | |
Remove default arguments in CFX_RenderDevice.
Review-Url: https://codereview.chromium.org/2011943004
Diffstat (limited to 'xfa/fxfa/app')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 957a31f584..2a9638e817 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -558,10 +558,11 @@ FX_BOOL CXFA_ImageRenderer::Start(CFX_RenderDevice* pDevice, m_BlendType = blendType; return StartDIBSource(); } + FX_BOOL CXFA_ImageRenderer::StartDIBSource() { - if (m_pDevice->StartDIBits(m_pDIBSource, m_BitmapAlpha, m_FillArgb, - &m_ImageMatrix, m_Flags, m_DeviceHandle, 0, NULL, - m_BlendType)) { + if (m_pDevice->StartDIBitsWithBlend(m_pDIBSource, m_BitmapAlpha, m_FillArgb, + &m_ImageMatrix, m_Flags, m_DeviceHandle, + m_BlendType)) { if (m_DeviceHandle) { m_Status = 3; return TRUE; @@ -607,8 +608,9 @@ FX_BOOL CXFA_ImageRenderer::StartDIBSource() { dest_left = dest_width > 0 ? image_rect.left : image_rect.right; dest_top = dest_height > 0 ? image_rect.top : image_rect.bottom; if (m_pDIBSource->IsOpaqueImage() && m_BitmapAlpha == 255) { - if (m_pDevice->StretchDIBits(m_pDIBSource, dest_left, dest_top, dest_width, - dest_height, m_Flags, NULL, m_BlendType)) { + if (m_pDevice->StretchDIBitsWithFlagsAndBlend( + m_pDIBSource, dest_left, dest_top, dest_width, dest_height, m_Flags, + m_BlendType)) { return FALSE; } } @@ -616,8 +618,9 @@ FX_BOOL CXFA_ImageRenderer::StartDIBSource() { if (m_BitmapAlpha != 255) { m_FillArgb = FXARGB_MUL_ALPHA(m_FillArgb, m_BitmapAlpha); } - if (m_pDevice->StretchBitMask(m_pDIBSource, dest_left, dest_top, dest_width, - dest_height, m_FillArgb, m_Flags)) { + if (m_pDevice->StretchBitMaskWithFlags(m_pDIBSource, dest_left, dest_top, + dest_width, dest_height, m_FillArgb, + m_Flags)) { return FALSE; } } @@ -658,9 +661,9 @@ FX_BOOL CXFA_ImageRenderer::Continue(IFX_Pause* pPause) { } else { if (m_BitmapAlpha != 255) pBitmap->MultiplyAlpha(m_BitmapAlpha); - m_Result = - m_pDevice->SetDIBits(pBitmap.get(), m_pTransformer->result().left, - m_pTransformer->result().top, m_BlendType); + m_Result = m_pDevice->SetDIBitsWithBlend( + pBitmap.get(), m_pTransformer->result().left, + m_pTransformer->result().top, m_BlendType); } return FALSE; } @@ -711,7 +714,7 @@ void CXFA_ImageRenderer::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap, if (pDIBitmap->IsAlphaMask()) { return; } - m_pDevice->SetDIBits(pDIBitmap, left, top, blend_mode); + m_pDevice->SetDIBitsWithBlend(pDIBitmap, left, top, blend_mode); } else { FX_RECT rect(left, top, left + pDIBitmap->GetWidth(), top + pDIBitmap->GetHeight()); @@ -738,10 +741,10 @@ void CXFA_ImageRenderer::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap, if (m_pDevice->GetBackDrop()) { m_pDevice->SetDIBits(pClone, rect.left, rect.top); } else { - if (pDIBitmap->IsAlphaMask()) { + if (pDIBitmap->IsAlphaMask()) return; - } - m_pDevice->SetDIBits(pDIBitmap, rect.left, rect.top, blend_mode); + m_pDevice->SetDIBitsWithBlend(pDIBitmap, rect.left, rect.top, + blend_mode); } if (bClone) { delete pClone; |