From ec4d28f844e72dbe47b9c6d464abc04d947b4bf5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 12 Jul 2018 18:54:51 +0000 Subject: Rename 'ori' to 'backdrop' in rendering code. Change-Id: I6fa3fd93638bc3aeaaef854676fe31476888433b Reviewed-on: https://pdfium-review.googlesource.com/37671 Reviewed-by: Henrique Nakashima Commit-Queue: Lei Zhang --- core/fxge/skia/fx_skia_device.cpp | 43 ++++++++++++++++++++------------------- core/fxge/skia/fx_skia_device.h | 4 ++-- 2 files changed, 24 insertions(+), 23 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 87cb178a52..e932781c9b 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -1496,10 +1496,10 @@ void CFX_SkiaDeviceDriver::PaintStroke(SkPaint* spaint, CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver( const RetainPtr& pBitmap, bool bRgbByteOrder, - const RetainPtr& pOriDevice, + const RetainPtr& pBackdropBitmap, bool bGroupKnockout) : m_pBitmap(pBitmap), - m_pOriDevice(pOriDevice), + m_pBackdropBitmap(pBackdropBitmap), m_pRecorder(nullptr), m_pCache(new SkiaState(this)), #ifdef _SKIA_SUPPORT_PATHS_ @@ -1521,7 +1521,7 @@ CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver( #ifdef _SKIA_SUPPORT_ CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(int size_x, int size_y) : m_pBitmap(nullptr), - m_pOriDevice(nullptr), + m_pBackdropBitmap(nullptr), m_pRecorder(new SkPictureRecorder), m_pCache(new SkiaState(this)), m_bGroupKnockout(false) { @@ -1531,7 +1531,7 @@ CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(int size_x, int size_y) CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(SkPictureRecorder* recorder) : m_pBitmap(nullptr), - m_pOriDevice(nullptr), + m_pBackdropBitmap(nullptr), m_pRecorder(recorder), m_pCache(new SkiaState(this)), m_bGroupKnockout(false) { @@ -2222,8 +2222,8 @@ bool CFX_SkiaDeviceDriver::GetDIBits(const RetainPtr& pBitmap, FX_RECT rect(left, top, left + pBitmap->GetWidth(), top + pBitmap->GetHeight()); RetainPtr pBack; - if (m_pOriDevice) { - pBack = m_pOriDevice->Clone(&rect); + if (m_pBackdropBitmap) { + pBack = m_pBackdropBitmap->Clone(&rect); if (!pBack) return true; @@ -2250,7 +2250,7 @@ bool CFX_SkiaDeviceDriver::GetDIBits(const RetainPtr& pBitmap, } RetainPtr CFX_SkiaDeviceDriver::GetBackDrop() { - return m_pOriDevice; + return m_pBackdropBitmap; } bool CFX_SkiaDeviceDriver::SetDIBits(const RetainPtr& pBitmap, @@ -2345,7 +2345,7 @@ bool CFX_SkiaDeviceDriver::StartDIBits( int blend_type) { #ifdef _SKIA_SUPPORT_ m_pCache->FlushForDraw(); - DebugValidate(m_pBitmap, m_pOriDevice); + DebugValidate(m_pBitmap, m_pBackdropBitmap); std::unique_ptr dst8Storage; std::unique_ptr dst32Storage; SkBitmap skBitmap; @@ -2379,7 +2379,7 @@ bool CFX_SkiaDeviceDriver::StartDIBits( m_pCanvas->drawBitmap(skBitmap, 0, 0, &paint); } m_pCanvas->restore(); - DebugValidate(m_pBitmap, m_pOriDevice); + DebugValidate(m_pBitmap, m_pBackdropBitmap); #endif // _SKIA_SUPPORT_ #ifdef _SKIA_SUPPORT_PATHS_ @@ -2474,7 +2474,7 @@ bool CFX_SkiaDeviceDriver::DrawBitsWithMask( int bitmap_alpha, const CFX_Matrix* pMatrix, int blend_type) { - DebugValidate(m_pBitmap, m_pOriDevice); + DebugValidate(m_pBitmap, m_pBackdropBitmap); std::unique_ptr src8Storage, mask8Storage; std::unique_ptr src32Storage, mask32Storage; SkBitmap skBitmap, skMask; @@ -2505,7 +2505,7 @@ bool CFX_SkiaDeviceDriver::DrawBitsWithMask( SkRect r = {0, 0, SkIntToScalar(srcWidth), SkIntToScalar(srcHeight)}; m_pCanvas->drawRect(r, paint); m_pCanvas->restore(); - DebugValidate(m_pBitmap, m_pOriDevice); + DebugValidate(m_pBitmap, m_pBackdropBitmap); return true; } @@ -2537,8 +2537,8 @@ void CFX_SkiaDeviceDriver::Dump() const { #ifdef _SKIA_SUPPORT_ void CFX_SkiaDeviceDriver::DebugVerifyBitmapIsPreMultiplied() const { - if (m_pOriDevice) - m_pOriDevice->DebugVerifyBitmapIsPreMultiplied(nullptr); + if (m_pBackdropBitmap) + m_pBackdropBitmap->DebugVerifyBitmapIsPreMultiplied(nullptr); } #endif // _SKIA_SUPPORT_ @@ -2559,15 +2559,16 @@ SkPictureRecorder* CFX_DefaultRenderDevice::CreateRecorder(int size_x, } #endif // _SKIA_SUPPORT_ -bool CFX_DefaultRenderDevice::Attach(const RetainPtr& pBitmap, - bool bRgbByteOrder, - const RetainPtr& pOriDevice, - bool bGroupKnockout) { +bool CFX_DefaultRenderDevice::Attach( + const RetainPtr& pBitmap, + bool bRgbByteOrder, + const RetainPtr& pBackdropBitmap, + bool bGroupKnockout) { if (!pBitmap) return false; SetBitmap(pBitmap); SetDeviceDriver(pdfium::MakeUnique( - pBitmap, bRgbByteOrder, pOriDevice, bGroupKnockout)); + pBitmap, bRgbByteOrder, pBackdropBitmap, bGroupKnockout)); return true; } @@ -2584,14 +2585,14 @@ bool CFX_DefaultRenderDevice::Create( int width, int height, FXDIB_Format format, - const RetainPtr& pOriDevice) { + const RetainPtr& pBackdropBitmap) { auto pBitmap = pdfium::MakeRetain(); if (!pBitmap->Create(width, height, format)) { return false; } SetBitmap(pBitmap); - SetDeviceDriver(pdfium::MakeUnique(pBitmap, false, - pOriDevice, false)); + SetDeviceDriver(pdfium::MakeUnique( + pBitmap, false, pBackdropBitmap, false)); return true; } diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 8fdd4fd03f..692199f6bb 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -26,7 +26,7 @@ class CFX_SkiaDeviceDriver : public RenderDeviceDriverIface { public: CFX_SkiaDeviceDriver(const RetainPtr& pBitmap, bool bRgbByteOrder, - const RetainPtr& pOriDevice, + const RetainPtr& pBackdropBitmap, bool bGroupKnockout); #ifdef _SKIA_SUPPORT_ explicit CFX_SkiaDeviceDriver(SkPictureRecorder* recorder); @@ -160,7 +160,7 @@ class CFX_SkiaDeviceDriver : public RenderDeviceDriverIface { private: RetainPtr m_pBitmap; - RetainPtr m_pOriDevice; + RetainPtr m_pBackdropBitmap; SkCanvas* m_pCanvas; SkPictureRecorder* const m_pRecorder; std::unique_ptr m_pCache; -- cgit v1.2.3