Merge to XFA: Change _PDF_RenderItem to CPDF_RenderContext::Layer.
Original Review URL: https://codereview.chromium.org/1620523002 .
(cherry picked from commit d5712ac571f3487fe3f74617fdab007a11a09052)
TBR=ochang@chromium.org
Review URL: https://codereview.chromium.org/1624553004 .
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index b4178a7..2637dd3 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -20,8 +20,6 @@
class CPDF_ImageCacheEntry;
class CPDF_ImageObject;
class CPDF_PathObject;
-class CPDF_RenderContext;
-class CPDF_RenderOptions;
class CPDF_RenderStatus;
class CPDF_ShadingObject;
class CPDF_TextObject;
@@ -55,69 +53,65 @@
#define RENDER_NOPATHSMOOTH 0x20000000
#define RENDER_NOIMAGESMOOTH 0x40000000
#define RENDER_LIMITEDIMAGECACHE 0x80000000
+
class CPDF_RenderOptions {
public:
CPDF_RenderOptions();
+ FX_ARGB TranslateColor(FX_ARGB argb) const;
int m_ColorMode;
-
FX_COLORREF m_BackColor;
-
FX_COLORREF m_ForeColor;
-
FX_DWORD m_Flags;
-
int m_Interpolation;
-
FX_DWORD m_AddFlags;
-
IPDF_OCContext* m_pOCContext;
-
FX_DWORD m_dwLimitCacheSize;
-
int m_HalftoneLimit;
-
- FX_ARGB TranslateColor(FX_ARGB argb) const;
};
+
class CPDF_RenderContext {
public:
+ class Layer {
+ public:
+ CPDF_PageObjectList* m_pObjectList;
+ CFX_Matrix m_Matrix;
+ };
+
explicit CPDF_RenderContext(CPDF_Page* pPage);
CPDF_RenderContext(CPDF_Document* pDoc, CPDF_PageRenderCache* pPageCache);
~CPDF_RenderContext();
- void AppendObjectList(CPDF_PageObjectList* pObjs,
- const CFX_Matrix* pObject2Device);
+ void AppendLayer(CPDF_PageObjectList* pObjectList,
+ const CFX_Matrix* pObject2Device);
void Render(CFX_RenderDevice* pDevice,
- const CPDF_RenderOptions* pOptions = NULL,
- const CFX_Matrix* pFinalMatrix = NULL);
+ const CPDF_RenderOptions* pOptions,
+ const CFX_Matrix* pFinalMatrix);
- void DrawObjectList(CFX_RenderDevice* pDevice,
- CPDF_PageObjectList* pObjs,
- const CFX_Matrix* pObject2Device,
- const CPDF_RenderOptions* pOptions);
+ void Render(CFX_RenderDevice* pDevice,
+ const CPDF_PageObject* pStopObj,
+ const CPDF_RenderOptions* pOptions,
+ const CFX_Matrix* pFinalMatrix);
void GetBackground(CFX_DIBitmap* pBuffer,
const CPDF_PageObject* pObj,
const CPDF_RenderOptions* pOptions,
CFX_Matrix* pFinalMatrix);
+ FX_DWORD CountLayers() const { return m_Layers.GetSize(); }
+ Layer* GetLayer(FX_DWORD index) { return m_Layers.GetDataPtr(index); }
+
+ CPDF_Document* GetDocument() const { return m_pDocument; }
+ CPDF_Dictionary* GetPageResources() const { return m_pPageResources; }
CPDF_PageRenderCache* GetPageCache() const { return m_pPageCache; }
protected:
- void Render(CFX_RenderDevice* pDevice,
- const CPDF_PageObject* pStopObj,
- const CPDF_RenderOptions* pOptions,
- const CFX_Matrix* pFinalMatrix);
-
CPDF_Document* const m_pDocument;
CPDF_Dictionary* m_pPageResources;
CPDF_PageRenderCache* m_pPageCache;
- CFX_ArrayTemplate<struct _PDF_RenderItem> m_ContentList;
FX_BOOL m_bFirstLayer;
-
- friend class CPDF_RenderStatus;
- friend class CPDF_ProgressiveRenderer;
+ CFX_ArrayTemplate<Layer> m_Layers;
};
class CPDF_ProgressiveRenderer {
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index 5222d69..583b19f 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -212,7 +212,7 @@
m_GroupFamily = GroupFamily;
m_bLoadMask = bLoadMask;
m_pFormResource = pFormResource;
- m_pPageResource = m_pContext->m_pPageResources;
+ m_pPageResource = m_pContext->GetPageResources();
if (pInitialStates && !m_pType3Char) {
m_InitialStates.CopyStates(*pInitialStates);
if (pParentState) {
@@ -538,7 +538,7 @@
}
CPDF_TransferFunc* CPDF_RenderStatus::GetTransferFunc(CPDF_Object* pObj) const {
ASSERT(pObj);
- CPDF_DocRenderData* pDocCache = m_pContext->m_pDocument->GetRenderData();
+ CPDF_DocRenderData* pDocCache = m_pContext->GetDocument()->GetRenderData();
return pDocCache ? pDocCache->GetTransferFunc(pObj) : nullptr;
}
FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj,
@@ -758,8 +758,8 @@
pGeneralState->m_FillOP && pGeneralState->m_StrokeOP) {
CPDF_Document* pDocument = NULL;
CPDF_Page* pPage = NULL;
- if (m_pContext->m_pPageCache) {
- pPage = m_pContext->m_pPageCache->GetPage();
+ if (m_pContext->GetPageCache()) {
+ pPage = m_pContext->GetPageCache()->GetPage();
pDocument = pPage->m_pDocument;
} else {
pDocument = ((CPDF_ImageObject*)pPageObj)->m_pImage->GetDocument();
@@ -956,26 +956,30 @@
}
return pStates;
}
+
CPDF_RenderContext::CPDF_RenderContext(CPDF_Page* pPage)
: m_pDocument(pPage->m_pDocument),
m_pPageResources(pPage->m_pPageResources),
m_pPageCache(pPage->GetRenderCache()),
m_bFirstLayer(TRUE) {}
+
CPDF_RenderContext::CPDF_RenderContext(CPDF_Document* pDoc,
CPDF_PageRenderCache* pPageCache)
: m_pDocument(pDoc),
m_pPageResources(nullptr),
m_pPageCache(pPageCache),
m_bFirstLayer(TRUE) {}
+
CPDF_RenderContext::~CPDF_RenderContext() {}
-void CPDF_RenderContext::AppendObjectList(CPDF_PageObjectList* pObjs,
- const CFX_Matrix* pObject2Device) {
- _PDF_RenderItem* pItem = m_ContentList.AddSpace();
- pItem->m_pObjectList = pObjs;
+
+void CPDF_RenderContext::AppendLayer(CPDF_PageObjectList* pObjs,
+ const CFX_Matrix* pObject2Device) {
+ Layer* pLayer = m_Layers.AddSpace();
+ pLayer->m_pObjectList = pObjs;
if (pObject2Device) {
- pItem->m_Matrix = *pObject2Device;
+ pLayer->m_Matrix = *pObject2Device;
} else {
- pItem->m_Matrix.SetIdentity();
+ pLayer->m_Matrix.SetIdentity();
}
}
void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
@@ -987,18 +991,18 @@
const CPDF_PageObject* pStopObj,
const CPDF_RenderOptions* pOptions,
const CFX_Matrix* pLastMatrix) {
- int count = m_ContentList.GetSize();
+ int count = m_Layers.GetSize();
for (int j = 0; j < count; j++) {
pDevice->SaveState();
- _PDF_RenderItem* pItem = m_ContentList.GetDataPtr(j);
+ Layer* pLayer = m_Layers.GetDataPtr(j);
if (pLastMatrix) {
- CFX_Matrix FinalMatrix = pItem->m_Matrix;
+ CFX_Matrix FinalMatrix = pLayer->m_Matrix;
FinalMatrix.Concat(*pLastMatrix);
CPDF_RenderStatus status;
status.Initialize(this, pDevice, pLastMatrix, pStopObj, NULL, NULL,
- pOptions, pItem->m_pObjectList->m_Transparency, FALSE,
+ pOptions, pLayer->m_pObjectList->m_Transparency, FALSE,
NULL);
- status.RenderObjectList(pItem->m_pObjectList, &FinalMatrix);
+ status.RenderObjectList(pLayer->m_pObjectList, &FinalMatrix);
if (status.m_Options.m_Flags & RENDER_LIMITEDIMAGECACHE) {
m_pPageCache->CacheOptimization(status.m_Options.m_dwLimitCacheSize);
}
@@ -1009,8 +1013,8 @@
} else {
CPDF_RenderStatus status;
status.Initialize(this, pDevice, NULL, pStopObj, NULL, NULL, pOptions,
- pItem->m_pObjectList->m_Transparency, FALSE, NULL);
- status.RenderObjectList(pItem->m_pObjectList, &pItem->m_Matrix);
+ pLayer->m_pObjectList->m_Transparency, FALSE, NULL);
+ status.RenderObjectList(pLayer->m_pObjectList, &pLayer->m_Matrix);
if (status.m_Options.m_Flags & RENDER_LIMITEDIMAGECACHE) {
m_pPageCache->CacheOptimization(status.m_Options.m_dwLimitCacheSize);
}
@@ -1022,13 +1026,6 @@
pDevice->RestoreState();
}
}
-void CPDF_RenderContext::DrawObjectList(CFX_RenderDevice* pDevice,
- CPDF_PageObjectList* pObjs,
- const CFX_Matrix* pObject2Device,
- const CPDF_RenderOptions* pOptions) {
- AppendObjectList(pObjs, pObject2Device);
- Render(pDevice, pOptions);
-}
CPDF_ProgressiveRenderer::CPDF_ProgressiveRenderer(
CPDF_RenderContext* pContext,
@@ -1058,23 +1055,22 @@
Continue(pPause);
}
-#define RENDER_STEP_LIMIT 100
void CPDF_ProgressiveRenderer::Continue(IFX_Pause* pPause) {
if (m_Status != ToBeContinued) {
return;
}
- FX_DWORD nLayers = m_pContext->m_ContentList.GetSize();
+ FX_DWORD nLayers = m_pContext->CountLayers();
for (; m_LayerIndex < nLayers; m_LayerIndex++) {
- _PDF_RenderItem* pItem = m_pContext->m_ContentList.GetDataPtr(m_LayerIndex);
- FX_POSITION LastPos = pItem->m_pObjectList->GetLastObjectPosition();
+ CPDF_RenderContext::Layer* pLayer = m_pContext->GetLayer(m_LayerIndex);
+ FX_POSITION LastPos = pLayer->m_pObjectList->GetLastObjectPosition();
if (!m_ObjectPos) {
if (LastPos == m_PrevLastPos) {
- if (!pItem->m_pObjectList->IsParsed()) {
- pItem->m_pObjectList->ContinueParse(pPause);
- if (!pItem->m_pObjectList->IsParsed()) {
+ if (!pLayer->m_pObjectList->IsParsed()) {
+ pLayer->m_pObjectList->ContinueParse(pPause);
+ if (!pLayer->m_pObjectList->IsParsed()) {
return;
}
- LastPos = pItem->m_pObjectList->GetLastObjectPosition();
+ LastPos = pLayer->m_pObjectList->GetLastObjectPosition();
}
}
if (LastPos == m_PrevLastPos) {
@@ -1088,23 +1084,23 @@
}
if (m_PrevLastPos) {
m_ObjectPos = m_PrevLastPos;
- pItem->m_pObjectList->GetNextObject(m_ObjectPos);
+ pLayer->m_pObjectList->GetNextObject(m_ObjectPos);
} else {
- m_ObjectPos = pItem->m_pObjectList->GetFirstObjectPosition();
+ m_ObjectPos = pLayer->m_pObjectList->GetFirstObjectPosition();
}
m_PrevLastPos = LastPos;
}
if (!m_pRenderStatus) {
- m_ObjectPos = pItem->m_pObjectList->GetFirstObjectPosition();
+ m_ObjectPos = pLayer->m_pObjectList->GetFirstObjectPosition();
m_ObjectIndex = 0;
m_pRenderStatus.reset(new CPDF_RenderStatus());
m_pRenderStatus->Initialize(
m_pContext, m_pDevice, NULL, NULL, NULL, NULL, m_pOptions,
- pItem->m_pObjectList->m_Transparency, FALSE, NULL);
+ pLayer->m_pObjectList->m_Transparency, FALSE, NULL);
m_pDevice->SaveState();
m_ClipRect = m_pDevice->GetClipBox();
CFX_Matrix device2object;
- device2object.SetReverse(pItem->m_Matrix);
+ device2object.SetReverse(pLayer->m_Matrix);
device2object.TransformRect(m_ClipRect);
}
int objs_to_go = CPDF_ModuleMgr::Get()
@@ -1112,12 +1108,13 @@
->GetConfig()
->m_RenderStepLimit;
while (m_ObjectPos) {
- CPDF_PageObject* pCurObj = pItem->m_pObjectList->GetObjectAt(m_ObjectPos);
+ CPDF_PageObject* pCurObj =
+ pLayer->m_pObjectList->GetObjectAt(m_ObjectPos);
if (pCurObj && pCurObj->m_Left <= m_ClipRect.right &&
pCurObj->m_Right >= m_ClipRect.left &&
pCurObj->m_Bottom <= m_ClipRect.top &&
pCurObj->m_Top >= m_ClipRect.bottom) {
- if (m_pRenderStatus->ContinueSingleObject(pCurObj, &pItem->m_Matrix,
+ if (m_pRenderStatus->ContinueSingleObject(pCurObj, &pLayer->m_Matrix,
pPause)) {
return;
}
@@ -1134,7 +1131,7 @@
}
}
m_ObjectIndex++;
- pItem->m_pObjectList->GetNextObject(m_ObjectPos);
+ pLayer->m_pObjectList->GetNextObject(m_ObjectPos);
if (objs_to_go == 0) {
if (pPause && pPause->NeedToPauseNow()) {
return;
@@ -1145,7 +1142,7 @@
->m_RenderStepLimit;
}
}
- if (!pItem->m_pObjectList->IsParsed()) {
+ if (!pLayer->m_pObjectList->IsParsed()) {
return;
}
m_pRenderStatus.reset();
@@ -1163,11 +1160,12 @@
if (!m_pContext) {
return 0;
}
- FX_DWORD nLayers = m_pContext->m_ContentList.GetSize();
- int nTotal = 0, nRendered = 0;
+ FX_DWORD nLayers = m_pContext->CountLayers();
+ int nTotal = 0;
+ int nRendered = 0;
for (FX_DWORD layer = 0; layer < nLayers; layer++) {
- _PDF_RenderItem* pItem = m_pContext->m_ContentList.GetDataPtr(layer);
- int nObjs = pItem->m_pObjectList->CountObjects();
+ CPDF_RenderContext::Layer* pLayer = m_pContext->GetLayer(layer);
+ int nObjs = pLayer->m_pObjectList->CountObjects();
if (layer == m_LayerIndex) {
nRendered += m_ObjectIndex;
} else if (layer < m_LayerIndex) {
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 3f7347b..a0b3059 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -883,7 +883,8 @@
CFX_Matrix matrix = *pMatrix;
matrix.TranslateI(-pClipRect->left, -pClipRect->top);
- CPDF_Form form(m_pContext->m_pDocument, m_pContext->m_pPageResources, pGroup);
+ CPDF_Form form(m_pContext->GetDocument(), m_pContext->GetPageResources(),
+ pGroup);
form.ParseContent(NULL, NULL, NULL, NULL);
CFX_FxgeDevice bitmap_device;
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
@@ -909,7 +910,7 @@
pCSObj = pDict->GetDict("Group")->GetElementValue("CS");
else
pCSObj = NULL;
- pCS = m_pContext->m_pDocument->LoadColorSpace(pCSObj);
+ pCS = m_pContext->GetDocument()->LoadColorSpace(pCSObj);
if (pCS) {
FX_FLOAT R, G, B;
FX_DWORD comps = 8;
@@ -931,7 +932,7 @@
pCS->GetRGB(pFloats, R, G, B);
back_color = 0xff000000 | ((int32_t)(R * 255) << 16) |
((int32_t)(G * 255) << 8) | (int32_t)(B * 255);
- m_pContext->m_pDocument->GetPageData()->ReleaseColorSpace(pCSObj);
+ m_pContext->GetDocument()->GetPageData()->ReleaseColorSpace(pCSObj);
}
}
bitmap.Clear(back_color);
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index 8cee178..c1bb6f6 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -989,8 +989,8 @@
flags |= RENDER_FORCE_HALFTONE;
options.m_Flags = flags;
CPDF_RenderContext context(pDoc, pCache);
- context.DrawObjectList(&bitmap_device, pPattern->m_pForm, &mtPattern2Bitmap,
- &options);
+ context.AppendLayer(pPattern->m_pForm, &mtPattern2Bitmap);
+ context.Render(&bitmap_device, &options, nullptr);
return pBitmap;
}
void CPDF_RenderStatus::DrawTilingPattern(CPDF_TilingPattern* pPattern,
@@ -1111,13 +1111,13 @@
CFX_DIBitmap* pPatternBitmap = NULL;
if (width * height < 16) {
CFX_DIBitmap* pEnlargedBitmap =
- DrawPatternBitmap(m_pContext->m_pDocument, m_pContext->m_pPageCache,
+ DrawPatternBitmap(m_pContext->GetDocument(), m_pContext->GetPageCache(),
pPattern, pObj2Device, 8, 8, m_Options.m_Flags);
pPatternBitmap = pEnlargedBitmap->StretchTo(width, height);
delete pEnlargedBitmap;
} else {
pPatternBitmap = DrawPatternBitmap(
- m_pContext->m_pDocument, m_pContext->m_pPageCache, pPattern,
+ m_pContext->GetDocument(), m_pContext->GetPageCache(), pPattern,
pObj2Device, width, height, m_Options.m_Flags);
}
if (!pPatternBitmap) {
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h
index 3a81ba5..d5018ad 100644
--- a/core/src/fpdfapi/fpdf_render/render_int.h
+++ b/core/src/fpdfapi/fpdf_render/render_int.h
@@ -91,13 +91,6 @@
CPDF_Type3CacheMap m_Type3FaceMap;
CPDF_TransferFuncMap m_TransferFuncMap;
};
-struct _PDF_RenderItem {
- public:
- CPDF_PageObjectList* m_pObjectList;
- CFX_Matrix m_Matrix;
-};
-
-typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer;
class IPDF_ObjectRenderer {
public:
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 814496f..5786349 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -227,7 +227,8 @@
return FALSE;
}
CPDF_RenderContext context(pPage);
- context.DrawObjectList(pDevice, pForm, &matrix, pOptions);
+ context.AppendLayer(pForm, &matrix);
+ context.Render(pDevice, pOptions, nullptr);
return TRUE;
}
FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
@@ -240,7 +241,7 @@
if (!pForm) {
return FALSE;
}
- pContext->AppendObjectList(pForm, &matrix);
+ pContext->AppendLayer(pForm, &matrix);
return TRUE;
}
void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice,
diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp
index bf37d85..1ec98bb 100644
--- a/core/src/fpdfdoc/doc_formcontrol.cpp
+++ b/core/src/fpdfdoc/doc_formcontrol.cpp
@@ -170,7 +170,8 @@
m_pField->m_pForm->m_pFormDict->GetDict("DR"), pStream);
form.ParseContent(NULL, NULL, NULL, NULL);
CPDF_RenderContext context(pPage);
- context.DrawObjectList(pDevice, &form, &matrix, pOptions);
+ context.AppendLayer(&form, &matrix);
+ context.Render(pDevice, pOptions, nullptr);
}
static const FX_CHAR* const g_sHighlightingMode[] = {
// Must match order of HiglightingMode enum.
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index a4f345e..ccd127c 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -951,7 +951,7 @@
pContext->m_pDevice->SetClip_Rect(&clip);
pContext->m_pContext = new CPDF_RenderContext(pPage);
- pContext->m_pContext->AppendObjectList(pPage, &matrix);
+ pContext->m_pContext->AppendLayer(pPage, &matrix);
if (flags & FPDF_ANNOT) {
pContext->m_pAnnots = new CPDF_AnnotList(pPage);
