summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-03-06 18:53:05 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-03-06 18:53:05 +0000
commita32145f1f16b7b02110bf359208f587d7d486551 (patch)
treec97a9fbd14c9996e4bb8ceaa5167f0212b17f62c /core/fpdfapi
parent9600a771999de20fb22130cdb97088591508f89f (diff)
downloadpdfium-a32145f1f16b7b02110bf359208f587d7d486551.tar.xz
Rename core/fxcrt IFX files to Iface
This CL renames the 3 IFX files in core/fxcrt to Iface instead. Change-Id: I7cee6836650b71bc5c5729a8147fda62f0910fe3 Reviewed-on: https://pdfium-review.googlesource.com/27970 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/page/cpdf_contentparser.cpp4
-rw-r--r--core/fpdfapi/page/cpdf_contentparser.h2
-rw-r--r--core/fpdfapi/page/cpdf_image.cpp2
-rw-r--r--core/fpdfapi/page/cpdf_image.h4
-rw-r--r--core/fpdfapi/page/cpdf_pageobjectholder.cpp2
-rw-r--r--core/fpdfapi/page/cpdf_pageobjectholder.h4
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.cpp6
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.h6
-rw-r--r--core/fpdfapi/render/cpdf_imagecacheentry.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_imagecacheentry.h4
-rw-r--r--core/fpdfapi/render/cpdf_imageloader.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_imageloader.h4
-rw-r--r--core/fpdfapi/render/cpdf_imagerenderer.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_imagerenderer.h2
-rw-r--r--core/fpdfapi/render/cpdf_pagerendercache.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_pagerendercache.h4
-rw-r--r--core/fpdfapi/render/cpdf_progressiverenderer.cpp6
-rw-r--r--core/fpdfapi/render/cpdf_progressiverenderer.h6
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.h2
20 files changed, 34 insertions, 34 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp
index 93151af305..08923f38b6 100644
--- a/core/fpdfapi/page/cpdf_contentparser.cpp
+++ b/core/fpdfapi/page/cpdf_contentparser.cpp
@@ -17,7 +17,7 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "core/fxcrt/ifx_pauseindicator.h"
+#include "core/fxcrt/pauseindicator_iface.h"
#include "third_party/base/ptr_util.h"
#define PARSE_STEP_LIMIT 100
@@ -109,7 +109,7 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm,
CPDF_ContentParser::~CPDF_ContentParser() {}
-bool CPDF_ContentParser::Continue(IFX_PauseIndicator* pPause) {
+bool CPDF_ContentParser::Continue(PauseIndicatorIface* pPause) {
if (m_bIsDone)
return false;
diff --git a/core/fpdfapi/page/cpdf_contentparser.h b/core/fpdfapi/page/cpdf_contentparser.h
index c65da6da55..b66783775b 100644
--- a/core/fpdfapi/page/cpdf_contentparser.h
+++ b/core/fpdfapi/page/cpdf_contentparser.h
@@ -37,7 +37,7 @@ class CPDF_ContentParser {
return m_pParser ? m_pParser->GetCurStates() : nullptr;
}
// Returns whether to continue or not.
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
private:
enum InternalStage {
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index b74de62250..68432bf1fe 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -370,7 +370,7 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource,
return false;
}
-bool CPDF_Image::Continue(IFX_PauseIndicator* pPause) {
+bool CPDF_Image::Continue(PauseIndicatorIface* pPause) {
RetainPtr<CPDF_DIBSource> pSource = m_pDIBSource.As<CPDF_DIBSource>();
CPDF_DIBSource::LoadState ret = pSource->ContinueLoadDIBSource(pPause);
if (ret == CPDF_DIBSource::LoadState::kContinue)
diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h
index 43011f8822..73ea92c666 100644
--- a/core/fpdfapi/page/cpdf_image.h
+++ b/core/fpdfapi/page/cpdf_image.h
@@ -19,7 +19,7 @@ class CFX_DIBSource;
class CFX_DIBitmap;
class CPDF_Document;
class CPDF_Page;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class IFX_SeekableReadStream;
class CPDF_Image : public Retainable {
@@ -57,7 +57,7 @@ class CPDF_Image : public Retainable {
bool bLoadMask = false);
// Returns whether to Continue() or not.
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
RetainPtr<CFX_DIBSource> DetachBitmap();
RetainPtr<CFX_DIBSource> DetachMask();
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
index 51a67e8a15..9413ffbfae 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.cpp
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
@@ -33,7 +33,7 @@ bool CPDF_PageObjectHolder::IsPage() const {
return false;
}
-void CPDF_PageObjectHolder::ContinueParse(IFX_PauseIndicator* pPause) {
+void CPDF_PageObjectHolder::ContinueParse(PauseIndicatorIface* pPause) {
if (!m_pParser)
return;
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h
index f649ef7b62..aac907763c 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -17,7 +17,7 @@
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/unowned_ptr.h"
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CPDF_Dictionary;
class CPDF_Stream;
class CPDF_Document;
@@ -49,7 +49,7 @@ class CPDF_PageObjectHolder {
virtual bool IsPage() const;
- void ContinueParse(IFX_PauseIndicator* pPause);
+ void ContinueParse(PauseIndicatorIface* pPause);
bool IsParsed() const { return m_ParseState == CONTENT_PARSED; }
CPDF_PageObjectList* GetPageObjectList() { return &m_PageObjectList; }
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp
index 8dd53e4d1e..d552842756 100644
--- a/core/fpdfapi/render/cpdf_dibsource.cpp
+++ b/core/fpdfapi/render/cpdf_dibsource.cpp
@@ -301,7 +301,7 @@ CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadDIBSource(
}
CPDF_DIBSource::LoadState CPDF_DIBSource::ContinueLoadDIBSource(
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
if (m_Status == LoadState::kContinue)
return ContinueLoadMaskDIB(pPause);
@@ -697,7 +697,7 @@ CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadMask() {
}
CPDF_DIBSource::LoadState CPDF_DIBSource::ContinueLoadMaskDIB(
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
if (!m_pMask)
return LoadState::kSuccess;
@@ -1087,7 +1087,7 @@ const uint8_t* CPDF_DIBSource::GetScanline(int line) const {
}
bool CPDF_DIBSource::SkipToScanline(int line,
- IFX_PauseIndicator* pPause) const {
+ PauseIndicatorIface* pPause) const {
return m_pDecoder && m_pDecoder->SkipToScanline(line, pPause);
}
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h
index e66a45e303..534baabf16 100644
--- a/core/fpdfapi/render/cpdf_dibsource.h
+++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -51,7 +51,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
bool Load(CPDF_Document* pDoc, const CPDF_Stream* pStream);
// CFX_DIBSource
- bool SkipToScanline(int line, IFX_PauseIndicator* pPause) const override;
+ bool SkipToScanline(int line, PauseIndicatorIface* pPause) const override;
uint8_t* GetBuffer() const override;
const uint8_t* GetScanline(int line) const override;
void DownSampleScanline(int line,
@@ -73,7 +73,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
bool bStdCS = false,
uint32_t GroupFamily = 0,
bool bLoadMask = false);
- LoadState ContinueLoadDIBSource(IFX_PauseIndicator* pPause);
+ LoadState ContinueLoadDIBSource(PauseIndicatorIface* pPause);
RetainPtr<CPDF_DIBSource> DetachMask();
bool IsJBigImage() const;
@@ -84,7 +84,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
LoadState StartLoadMask();
LoadState StartLoadMaskDIB();
bool ContinueToLoadMask();
- LoadState ContinueLoadMaskDIB(IFX_PauseIndicator* pPause);
+ LoadState ContinueLoadMaskDIB(PauseIndicatorIface* pPause);
bool LoadColorInfo(const CPDF_Dictionary* pFormResources,
const CPDF_Dictionary* pPageResources);
DIB_COMP_DATA* GetDecodeAndMaskArray(bool* bDefaultDecode, bool* bColorKey);
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
index f0b0c33750..65c9a6b9a4 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
@@ -82,7 +82,7 @@ CPDF_DIBSource::LoadState CPDF_ImageCacheEntry::StartGetCachedBitmap(
return CPDF_DIBSource::LoadState::kFail;
}
-bool CPDF_ImageCacheEntry::Continue(IFX_PauseIndicator* pPause,
+bool CPDF_ImageCacheEntry::Continue(PauseIndicatorIface* pPause,
CPDF_RenderStatus* pRenderStatus) {
CPDF_DIBSource::LoadState ret =
m_pCurBitmap.As<CPDF_DIBSource>()->ContinueLoadDIBSource(pPause);
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h
index dfeeddf408..b397370eea 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.h
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.h
@@ -19,7 +19,7 @@ class CPDF_Dictionary;
class CPDF_Document;
class CPDF_Image;
class CPDF_RenderStatus;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CPDF_ImageCacheEntry {
public:
@@ -41,7 +41,7 @@ class CPDF_ImageCacheEntry {
CPDF_RenderStatus* pRenderStatus);
// Returns whether to Continue() or not.
- bool Continue(IFX_PauseIndicator* pPause, CPDF_RenderStatus* pRenderStatus);
+ bool Continue(PauseIndicatorIface* pPause, CPDF_RenderStatus* pRenderStatus);
RetainPtr<CFX_DIBSource> DetachBitmap();
RetainPtr<CFX_DIBSource> DetachMask();
diff --git a/core/fpdfapi/render/cpdf_imageloader.cpp b/core/fpdfapi/render/cpdf_imageloader.cpp
index 08aa5f1784..c8f9013029 100644
--- a/core/fpdfapi/render/cpdf_imageloader.cpp
+++ b/core/fpdfapi/render/cpdf_imageloader.cpp
@@ -43,7 +43,7 @@ bool CPDF_ImageLoader::Start(const CPDF_ImageObject* pImage,
return ret;
}
-bool CPDF_ImageLoader::Continue(IFX_PauseIndicator* pPause,
+bool CPDF_ImageLoader::Continue(PauseIndicatorIface* pPause,
CPDF_RenderStatus* pRenderStatus) {
bool ret = m_pCache ? m_pCache->Continue(pPause, pRenderStatus)
: m_pImageObject->GetImage()->Continue(pPause);
diff --git a/core/fpdfapi/render/cpdf_imageloader.h b/core/fpdfapi/render/cpdf_imageloader.h
index 497ef156da..a4f313fb69 100644
--- a/core/fpdfapi/render/cpdf_imageloader.h
+++ b/core/fpdfapi/render/cpdf_imageloader.h
@@ -16,7 +16,7 @@
class CPDF_ImageObject;
class CPDF_PageRenderCache;
class CPDF_RenderStatus;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CPDF_ImageLoader {
public:
@@ -29,7 +29,7 @@ class CPDF_ImageLoader {
uint32_t GroupFamily,
bool bLoadMask,
CPDF_RenderStatus* pRenderStatus);
- bool Continue(IFX_PauseIndicator* pPause, CPDF_RenderStatus* pRenderStatus);
+ bool Continue(PauseIndicatorIface* pPause, CPDF_RenderStatus* pRenderStatus);
RetainPtr<CFX_DIBSource> m_pBitmap;
RetainPtr<CFX_DIBSource> m_pMask;
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index 1351597279..3844f69895 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -516,7 +516,7 @@ bool CPDF_ImageRenderer::StartBitmapAlpha() {
return false;
}
-bool CPDF_ImageRenderer::Continue(IFX_PauseIndicator* pPause) {
+bool CPDF_ImageRenderer::Continue(PauseIndicatorIface* pPause) {
if (m_Status == 2) {
if (m_pTransformer->Continue(pPause))
return true;
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index a5d9ba769b..e6c6d0c1b8 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h
@@ -43,7 +43,7 @@ class CPDF_ImageRenderer {
bool bStdCS,
int blendType);
- bool Continue(IFX_PauseIndicator* pPause);
+ bool Continue(PauseIndicatorIface* pPause);
bool GetResult() const { return m_Result; }
private:
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp
index 781f18f0e0..a929cb69c7 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.cpp
+++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp
@@ -110,7 +110,7 @@ bool CPDF_PageRenderCache::StartGetCachedBitmap(
return false;
}
-bool CPDF_PageRenderCache::Continue(IFX_PauseIndicator* pPause,
+bool CPDF_PageRenderCache::Continue(PauseIndicatorIface* pPause,
CPDF_RenderStatus* pRenderStatus) {
bool ret = m_pCurImageCacheEntry->Continue(pPause, pRenderStatus);
if (ret)
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.h b/core/fpdfapi/render/cpdf_pagerendercache.h
index 58f0bb7e32..fe94bed722 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.h
+++ b/core/fpdfapi/render/cpdf_pagerendercache.h
@@ -19,7 +19,7 @@ class CPDF_ImageCacheEntry;
class CPDF_Page;
class CPDF_RenderStatus;
class CPDF_Stream;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CPDF_PageRenderCache {
public:
@@ -41,7 +41,7 @@ class CPDF_PageRenderCache {
bool bLoadMask,
CPDF_RenderStatus* pRenderStatus);
- bool Continue(IFX_PauseIndicator* pPause, CPDF_RenderStatus* pRenderStatus);
+ bool Continue(PauseIndicatorIface* pPause, CPDF_RenderStatus* pRenderStatus);
private:
void ClearImageCacheEntry(CPDF_Stream* pStream);
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
index e509a25440..922e3fd60d 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
@@ -13,7 +13,7 @@
#include "core/fpdfapi/render/cpdf_pagerendercache.h"
#include "core/fpdfapi/render/cpdf_renderoptions.h"
#include "core/fpdfapi/render/cpdf_renderstatus.h"
-#include "core/fxcrt/ifx_pauseindicator.h"
+#include "core/fxcrt/pauseindicator_iface.h"
#include "core/fxge/cfx_renderdevice.h"
#include "third_party/base/ptr_util.h"
@@ -35,7 +35,7 @@ CPDF_ProgressiveRenderer::~CPDF_ProgressiveRenderer() {
}
}
-void CPDF_ProgressiveRenderer::Start(IFX_PauseIndicator* pPause) {
+void CPDF_ProgressiveRenderer::Start(PauseIndicatorIface* pPause) {
if (!m_pContext || !m_pDevice || m_Status != Ready) {
m_Status = Failed;
return;
@@ -44,7 +44,7 @@ void CPDF_ProgressiveRenderer::Start(IFX_PauseIndicator* pPause) {
Continue(pPause);
}
-void CPDF_ProgressiveRenderer::Continue(IFX_PauseIndicator* pPause) {
+void CPDF_ProgressiveRenderer::Continue(PauseIndicatorIface* pPause) {
while (m_Status == ToBeContinued) {
if (!m_pCurrentLayer) {
if (m_LayerIndex >= m_pContext->CountLayers()) {
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.h b/core/fpdfapi/render/cpdf_progressiverenderer.h
index ffd63a9aaf..5703b42918 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.h
@@ -17,7 +17,7 @@
class CPDF_RenderOptions;
class CPDF_RenderStatus;
class CFX_RenderDevice;
-class IFX_PauseIndicator;
+class PauseIndicatorIface;
class CPDF_ProgressiveRenderer {
public:
@@ -39,8 +39,8 @@ class CPDF_ProgressiveRenderer {
~CPDF_ProgressiveRenderer();
Status GetStatus() const { return m_Status; }
- void Start(IFX_PauseIndicator* pPause);
- void Continue(IFX_PauseIndicator* pPause);
+ void Start(PauseIndicatorIface* pPause);
+ void Continue(PauseIndicatorIface* pPause);
private:
// Maximum page objects to render before checking for pause.
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 0a01ae0ccf..b93c6f5b02 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -1124,7 +1124,7 @@ void CPDF_RenderStatus::RenderSingleObject(CPDF_PageObject* pObj,
bool CPDF_RenderStatus::ContinueSingleObject(CPDF_PageObject* pObj,
const CFX_Matrix* pObj2Device,
- IFX_PauseIndicator* pPause) {
+ PauseIndicatorIface* pPause) {
if (m_pImageRenderer) {
if (m_pImageRenderer->Continue(pPause))
return true;
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 8008092766..44afa10f19 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -61,7 +61,7 @@ class CPDF_RenderStatus {
void RenderSingleObject(CPDF_PageObject* pObj, const CFX_Matrix* pObj2Device);
bool ContinueSingleObject(CPDF_PageObject* pObj,
const CFX_Matrix* pObj2Device,
- IFX_PauseIndicator* pPause);
+ PauseIndicatorIface* pPause);
void ProcessClipPath(const CPDF_ClipPath& ClipPath,
const CFX_Matrix* pObj2Device);