summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp2
-rw-r--r--core/fxge/agg/fx_agg_driver.h2
-rw-r--r--core/fxge/cfx_renderdevice.cpp2
-rw-r--r--core/fxge/cfx_renderdevice.h4
-rw-r--r--core/fxge/dib/cfx_dibsource.cpp3
-rw-r--r--core/fxge/dib/cfx_dibsource.h4
-rw-r--r--core/fxge/dib/cfx_imagerenderer.cpp2
-rw-r--r--core/fxge/dib/cfx_imagerenderer.h2
-rw-r--r--core/fxge/dib/cfx_imagestretcher.cpp6
-rw-r--r--core/fxge/dib/cfx_imagestretcher.h8
-rw-r--r--core/fxge/dib/cfx_imagetransformer.cpp2
-rw-r--r--core/fxge/dib/cfx_imagetransformer.h2
-rw-r--r--core/fxge/dib/cstretchengine.cpp6
-rw-r--r--core/fxge/dib/cstretchengine.h6
-rw-r--r--core/fxge/ifx_renderdevicedriver.cpp2
-rw-r--r--core/fxge/ifx_renderdevicedriver.h4
-rw-r--r--core/fxge/skia/fx_skia_device.cpp2
-rw-r--r--core/fxge/skia/fx_skia_device.h2
18 files changed, 31 insertions, 30 deletions
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 922f39efcd..9d8d8fa0a1 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1562,7 +1562,7 @@ bool CFX_AggDeviceDriver::StartDIBits(
}
bool CFX_AggDeviceDriver::ContinueDIBits(CFX_ImageRenderer* pHandle,
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
return m_pBitmap->GetBuffer() ? pHandle->Continue(pPause) : true;
}
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 41b97da2fb..3f4481c507 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -90,7 +90,7 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
std::unique_ptr<CFX_ImageRenderer>* handle,
int blend_type) override;
bool ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause) override;
+ PauseIndicatorIface* pPause) override;
bool DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 919a7a98a7..af148eec01 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -844,7 +844,7 @@ bool CFX_RenderDevice::StartDIBitsWithBlend(
}
bool CFX_RenderDevice::ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
return m_pDeviceDriver->ContinueDIBits(handle, pPause);
}
diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h
index d3ebed41c4..925ec26108 100644
--- a/core/fxge/cfx_renderdevice.h
+++ b/core/fxge/cfx_renderdevice.h
@@ -17,7 +17,7 @@ class CFX_DIBitmap;
class CFX_Font;
class CFX_GraphStateData;
class CFX_ImageRenderer;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class IFX_RenderDeviceDriver;
#define FXDC_DEVICE_CLASS 1
@@ -205,7 +205,7 @@ class CFX_RenderDevice {
uint32_t flags,
std::unique_ptr<CFX_ImageRenderer>* handle,
int blend_type);
- bool ContinueDIBits(CFX_ImageRenderer* handle, IFX_PauseIndicator* pPause);
+ bool ContinueDIBits(CFX_ImageRenderer* handle, PauseIndicatorIface* pPause);
bool DrawNormalText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
diff --git a/core/fxge/dib/cfx_dibsource.cpp b/core/fxge/dib/cfx_dibsource.cpp
index 104b3caf96..86bec23c67 100644
--- a/core/fxge/dib/cfx_dibsource.cpp
+++ b/core/fxge/dib/cfx_dibsource.cpp
@@ -726,7 +726,8 @@ uint8_t* CFX_DIBSource::GetBuffer() const {
return nullptr;
}
-bool CFX_DIBSource::SkipToScanline(int line, IFX_PauseIndicator* pPause) const {
+bool CFX_DIBSource::SkipToScanline(int line,
+ PauseIndicatorIface* pPause) const {
return false;
}
diff --git a/core/fxge/dib/cfx_dibsource.h b/core/fxge/dib/cfx_dibsource.h
index 02cae5d0f2..0e7fb27dde 100644
--- a/core/fxge/dib/cfx_dibsource.h
+++ b/core/fxge/dib/cfx_dibsource.h
@@ -27,7 +27,7 @@ enum FXDIB_Channel {
class CFX_ClipRgn;
class CFX_DIBitmap;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CFX_DIBSource : public Retainable {
public:
@@ -35,7 +35,7 @@ class CFX_DIBSource : public Retainable {
virtual uint8_t* GetBuffer() const;
virtual const uint8_t* GetScanline(int line) const = 0;
- virtual bool SkipToScanline(int line, IFX_PauseIndicator* pPause) const;
+ virtual bool SkipToScanline(int line, PauseIndicatorIface* pPause) const;
virtual void DownSampleScanline(int line,
uint8_t* dest_scan,
int dest_bpp,
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 658d363c89..a196068a2e 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -87,7 +87,7 @@ CFX_ImageRenderer::CFX_ImageRenderer(const RetainPtr<CFX_DIBitmap>& pDevice,
CFX_ImageRenderer::~CFX_ImageRenderer() {}
-bool CFX_ImageRenderer::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageRenderer::Continue(PauseIndicatorIface* pPause) {
if (m_Status == 1)
return m_Stretcher->Continue(pPause);
if (m_Status != 2)
diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index 18a56e2782..14eaf56ff8 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -33,7 +33,7 @@ class CFX_ImageRenderer {
bool bRgbByteOrder);
~CFX_ImageRenderer();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
private:
const RetainPtr<CFX_DIBitmap> m_pDevice;
diff --git a/core/fxge/dib/cfx_imagestretcher.cpp b/core/fxge/dib/cfx_imagestretcher.cpp
index 03518c688e..af93b266c7 100644
--- a/core/fxge/dib/cfx_imagestretcher.cpp
+++ b/core/fxge/dib/cfx_imagestretcher.cpp
@@ -124,7 +124,7 @@ bool CFX_ImageStretcher::Start() {
return StartStretch();
}
-bool CFX_ImageStretcher::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::Continue(PauseIndicatorIface* pPause) {
if (m_Flags & FXDIB_DOWNSAMPLE)
return ContinueQuickStretch(pPause);
return ContinueStretch(pPause);
@@ -142,7 +142,7 @@ bool CFX_ImageStretcher::StartStretch() {
return true;
}
-bool CFX_ImageStretcher::ContinueStretch(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::ContinueStretch(PauseIndicatorIface* pPause) {
return m_pStretchEngine && m_pStretchEngine->Continue(pPause);
}
@@ -171,7 +171,7 @@ bool CFX_ImageStretcher::StartQuickStretch() {
return true;
}
-bool CFX_ImageStretcher::ContinueQuickStretch(IFX_PauseIndicator* pPause) {
+bool CFX_ImageStretcher::ContinueQuickStretch(PauseIndicatorIface* pPause) {
if (!m_pScanline)
return false;
diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h
index 2ecb2a0492..e2ed4e990b 100644
--- a/core/fxge/dib/cfx_imagestretcher.h
+++ b/core/fxge/dib/cfx_imagestretcher.h
@@ -17,7 +17,7 @@
#include "core/fxge/fx_dib.h"
class CFX_DIBSource;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CFX_ImageStretcher {
public:
@@ -30,15 +30,15 @@ class CFX_ImageStretcher {
~CFX_ImageStretcher();
bool Start();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
RetainPtr<CFX_DIBSource> source() { return m_pSource; }
private:
bool StartQuickStretch();
bool StartStretch();
- bool ContinueQuickStretch(IFX_PauseIndicator* pPause);
- bool ContinueStretch(IFX_PauseIndicator* pPause);
+ bool ContinueQuickStretch(PauseIndicatorIface* pPause);
+ bool ContinueStretch(PauseIndicatorIface* pPause);
UnownedPtr<IFX_ScanlineComposer> const m_pDest;
RetainPtr<CFX_DIBSource> m_pSource;
diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp
index e514153acf..6f3ab86996 100644
--- a/core/fxge/dib/cfx_imagetransformer.cpp
+++ b/core/fxge/dib/cfx_imagetransformer.cpp
@@ -265,7 +265,7 @@ CFX_ImageTransformer::CFX_ImageTransformer(const RetainPtr<CFX_DIBSource>& pSrc,
CFX_ImageTransformer::~CFX_ImageTransformer() {}
-bool CFX_ImageTransformer::Continue(IFX_PauseIndicator* pPause) {
+bool CFX_ImageTransformer::Continue(PauseIndicatorIface* pPause) {
if (m_Status == 1) {
if (m_Stretcher->Continue(pPause))
return true;
diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h
index d13ce3f130..97dd61f9e1 100644
--- a/core/fxge/dib/cfx_imagetransformer.h
+++ b/core/fxge/dib/cfx_imagetransformer.h
@@ -26,7 +26,7 @@ class CFX_ImageTransformer {
const FX_RECT* pClip);
~CFX_ImageTransformer();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
const FX_RECT& result() const { return m_result; }
RetainPtr<CFX_DIBitmap> DetachBitmap();
diff --git a/core/fxge/dib/cstretchengine.cpp b/core/fxge/dib/cstretchengine.cpp
index 6803959730..cb7ffa0166 100644
--- a/core/fxge/dib/cstretchengine.cpp
+++ b/core/fxge/dib/cstretchengine.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <utility>
-#include "core/fxcrt/ifx_pauseindicator.h"
+#include "core/fxcrt/pauseindicator_iface.h"
#include "core/fxge/dib/cfx_dibitmap.h"
#include "core/fxge/dib/cfx_dibsource.h"
#include "core/fxge/dib/ifx_scanlinecomposer.h"
@@ -311,7 +311,7 @@ CStretchEngine::CStretchEngine(IFX_ScanlineComposer* pDestBitmap,
CStretchEngine::~CStretchEngine() {}
-bool CStretchEngine::Continue(IFX_PauseIndicator* pPause) {
+bool CStretchEngine::Continue(PauseIndicatorIface* pPause) {
while (m_State == 1) {
if (ContinueStretchHorz(pPause))
return true;
@@ -348,7 +348,7 @@ bool CStretchEngine::StartStretchHorz() {
return true;
}
-bool CStretchEngine::ContinueStretchHorz(IFX_PauseIndicator* pPause) {
+bool CStretchEngine::ContinueStretchHorz(PauseIndicatorIface* pPause) {
if (!m_DestWidth)
return false;
if (m_pSource->SkipToScanline(m_CurRow, pPause))
diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h
index 8ce8351304..6f0d4dc54d 100644
--- a/core/fxge/dib/cstretchengine.h
+++ b/core/fxge/dib/cstretchengine.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class IFX_ScanlineComposer;
class CStretchEngine {
@@ -28,10 +28,10 @@ class CStretchEngine {
int flags);
~CStretchEngine();
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
bool StartStretchHorz();
- bool ContinueStretchHorz(IFX_PauseIndicator* pPause);
+ bool ContinueStretchHorz(PauseIndicatorIface* pPause);
void StretchVert();
class CWeightTable {
diff --git a/core/fxge/ifx_renderdevicedriver.cpp b/core/fxge/ifx_renderdevicedriver.cpp
index eae773d75c..ff8d8fde8d 100644
--- a/core/fxge/ifx_renderdevicedriver.cpp
+++ b/core/fxge/ifx_renderdevicedriver.cpp
@@ -57,7 +57,7 @@ RetainPtr<CFX_DIBitmap> IFX_RenderDeviceDriver::GetBackDrop() {
}
bool IFX_RenderDeviceDriver::ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
return false;
}
diff --git a/core/fxge/ifx_renderdevicedriver.h b/core/fxge/ifx_renderdevicedriver.h
index e9498bdf22..90c94da506 100644
--- a/core/fxge/ifx_renderdevicedriver.h
+++ b/core/fxge/ifx_renderdevicedriver.h
@@ -22,7 +22,7 @@ class CFX_Matrix;
class CFX_PathData;
class CPDF_ShadingPattern;
class FXTEXT_CHARPOS;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
struct FX_RECT;
class IFX_RenderDeviceDriver {
@@ -87,7 +87,7 @@ class IFX_RenderDeviceDriver {
std::unique_ptr<CFX_ImageRenderer>* handle,
int blend_type) = 0;
virtual bool ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause);
+ PauseIndicatorIface* pPause);
virtual bool DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
CFX_Font* pFont,
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 1885cef083..190ad9e80c 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2395,7 +2395,7 @@ bool CFX_SkiaDeviceDriver::StartDIBits(
}
bool CFX_SkiaDeviceDriver::ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
#ifdef _SKIA_SUPPORT_
m_pCache->FlushForDraw();
return false;
diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index c2e6c013d9..4e60191f74 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -121,7 +121,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
int blend_type) override;
bool ContinueDIBits(CFX_ImageRenderer* handle,
- IFX_PauseIndicator* pPause) override;
+ PauseIndicatorIface* pPause) override;
bool DrawBitsWithMask(const RetainPtr<CFX_DIBSource>& pBitmap,
const RetainPtr<CFX_DIBSource>& pMask,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 01:43:48 +0000