Merge to XFA: Fix infinite recursion in CPDF_RenderStatus::RenderSingleObject().

core/src/fpdfapi/fpdf_render/render_int.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FPDF_PAGEOBJ_H_
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #endif
 class CPDF_QuickStretcher;
@@ skipping 74 matching lines @@
     virtual ~IPDF_ObjectRenderer() {}
     virtual FX_BOOL Start(CPDF_RenderStatus* pRenderStatus, const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, FX_BOOL bStdCS, int blendType = FXDIB_BLEND_NORMAL) = 0;
     virtual FX_BOOL Continue(IFX_Pause* pPause) = 0;
     FX_BOOL             m_Result;
 };
 class CPDF_RenderStatus : public CFX_Object
 {
 public:
     CPDF_RenderStatus();
     ~CPDF_RenderStatus();
-    FX_BOOL                     Initialize(int level, class CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pDeviceMatrix,
+    FX_BOOL                     Initialize(class CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, const CFX_AffineMatrix* pDeviceMatrix,
                                const CPDF_PageObject* pStopObj, const CPDF_RenderStatus* pParentStatus,
                                const CPDF_GraphicStates* pInitialStates, const CPDF_RenderOptions* pOptions,
                                int transparency, FX_BOOL bDropObjects, CPDF_Dictionary* pFormResource = NULL,
                                FX_BOOL bStdCS = FALSE,  CPDF_Type3Char* pType3Char = NULL, FX_ARGB fill_color = 0,
                                FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE);
     void                        RenderObjectList(const CPDF_PageObjects* pObjs, const CFX_AffineMatrix* pObj2Device);
     void                        RenderSingleObject(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device);
     FX_BOOL                     ContinueSingleObject(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, IFX_Pause* pPause);
     CPDF_RenderOptions  m_Options;
     CPDF_Dictionary*    m_pFormResource;
@@ skipping 42 matching lines @@
     static class CPDF_Type3Cache*       GetCachedType3(CPDF_Type3Font* pFont);
     static CPDF_GraphicStates* CloneObjStates(const CPDF_GraphicStates* pPathObj, FX_BOOL bStroke);
     CPDF_TransferFunc*  GetTransferFunc(CPDF_Object* pObject) const;
     FX_ARGB                     GetFillArgb(const CPDF_PageObject* pObj, FX_BOOL bType3 = FALSE) const;
     FX_ARGB                     GetStrokeArgb(const CPDF_PageObject* pObj) const;
     CPDF_RenderContext*         m_pContext;
     FX_BOOL                                     m_bStopped;
     void                        DitherObjectArea(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device);
     FX_BOOL                     GetObjectClippedRect(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, FX_BOOL bLogical, FX_RECT &rect) const;
     void                        GetScaledMatrix(CFX_Matrix &matrix) const;
+
 protected:
-    int                                         m_Level;
+    static const int kRenderMaxRecursionDepth = 64;
+    static int s_CurrentRecursionDepth;
+
     CFX_RenderDevice*           m_pDevice;
     CFX_AffineMatrix            m_DeviceMatrix;
     CPDF_ClipPath                       m_LastClipPath;
     const CPDF_PageObject*      m_pCurObj;
     const CPDF_PageObject*      m_pStopObj;
     CPDF_GraphicStates          m_InitialStates;
     int                                         m_HalftoneLimit;
     IPDF_ObjectRenderer*        m_pObjectRenderer;
     FX_BOOL                                     m_bPrint;
     int                                         m_Transparency;
@@ skipping 279 matching lines @@
     virtual void                        TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const;
     FX_LPCBYTE                          m_RampR;
     FX_LPCBYTE                          m_RampG;
     FX_LPCBYTE                          m_RampB;
 };
 struct _CPDF_UniqueKeyGen {
     void                Generate(int count, ...);
     FX_CHAR             m_Key[128];
     int                 m_KeyLen;
 };