1 files changed, 1 insertions, 194 deletions

diff --git a/core/fpdfapi/page/pageint.h b/core/fpdfapi/page/pageint.h
index 7ab9c6c863..d70ecf1a6e 100644
--- a/core/fpdfapi/page/pageint.h
+++ b/core/fpdfapi/page/pageint.h
@@ -16,6 +16,7 @@
 #include "core/fpdfapi/page/cpdf_contentmark.h"
 #include "core/fpdfapi/page/cpdf_countedobject.h"
 #include "core/fpdfapi/page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_streamcontentparser.h"
 #include "core/fpdfapi/parser/cpdf_stream.h"
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
@@ -79,202 +80,8 @@ class CPDF_StreamParser {
   CFX_WeakPtr<CFX_ByteStringPool> m_pPool;
 };
 
-#define PARAM_BUF_SIZE 16
-
-struct ContentParam {
-  enum Type { OBJECT = 0, NUMBER, NAME };
-  Type m_Type;
-  union {
-    struct {
-      bool m_bInteger;
-      union {
-        int m_Integer;
-        FX_FLOAT m_Float;
-      };
-    } m_Number;
-    CPDF_Object* m_pObject;
-    struct {
-      int m_Len;
-      char m_Buffer[32];
-    } m_Name;
-  };
-};
-
-#define _FPDF_MAX_FORM_LEVEL_ 30
 #define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4
 
-class CPDF_StreamContentParser {
- public:
-  CPDF_StreamContentParser(CPDF_Document* pDoc,
-                           CPDF_Dictionary* pPageResources,
-                           CPDF_Dictionary* pParentResources,
-                           const CFX_Matrix* pmtContentToUser,
-                           CPDF_PageObjectHolder* pObjectHolder,
-                           CPDF_Dictionary* pResources,
-                           CFX_FloatRect* pBBox,
-                           CPDF_AllStates* pAllStates,
-                           int level);
-  ~CPDF_StreamContentParser();
-
-  CPDF_PageObjectHolder* GetPageObjectHolder() const { return m_pObjectHolder; }
-  CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
-  bool IsColored() const { return m_bColored; }
-  const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
-
-  void AddNumberParam(const FX_CHAR* str, int len);
-  void AddObjectParam(CPDF_Object* pObj);
-  void AddNameParam(const FX_CHAR* name, int size);
-  int GetNextParamPos();
-  void ClearAllParams();
-  CPDF_Object* GetObject(uint32_t index);
-  CFX_ByteString GetString(uint32_t index);
-  FX_FLOAT GetNumber(uint32_t index);
-  int GetInteger(uint32_t index) { return (int32_t)(GetNumber(index)); }
-  void OnOperator(const FX_CHAR* op);
-  void AddTextObject(CFX_ByteString* pText,
-                     FX_FLOAT fInitKerning,
-                     FX_FLOAT* pKerning,
-                     int count);
-
-  void ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y);
-  void ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y);
-  void OnChangeTextMatrix();
-  uint32_t Parse(const uint8_t* pData, uint32_t dwSize, uint32_t max_cost);
-  void ParsePathObject();
-  void AddPathPoint(FX_FLOAT x, FX_FLOAT y, int flag);
-  void AddPathRect(FX_FLOAT x, FX_FLOAT y, FX_FLOAT w, FX_FLOAT h);
-  void AddPathObject(int FillType, bool bStroke);
-  CPDF_ImageObject* AddImage(UniqueStream pStream);
-  CPDF_ImageObject* AddImage(uint32_t streamObjNum);
-  CPDF_ImageObject* AddImage(CPDF_Image* pImage);
-
-  void AddForm(CPDF_Stream* pStream);
-  void SetGraphicStates(CPDF_PageObject* pObj,
-                        bool bColor,
-                        bool bText,
-                        bool bGraph);
-  CPDF_Font* FindFont(const CFX_ByteString& name);
-  CPDF_ColorSpace* FindColorSpace(const CFX_ByteString& name);
-  CPDF_Pattern* FindPattern(const CFX_ByteString& name, bool bShading);
-  CPDF_Object* FindResourceObj(const CFX_ByteString& type,
-                               const CFX_ByteString& name);
-
- private:
-  using OpCodes =
-      std::unordered_map<uint32_t, void (CPDF_StreamContentParser::*)()>;
-  static OpCodes InitializeOpCodes();
-
-  // Takes ownership of |pImageObj|, returns unowned pointer to it.
-  CPDF_ImageObject* AddImageObject(std::unique_ptr<CPDF_ImageObject> pImageObj);
-
-  void Handle_CloseFillStrokePath();
-  void Handle_FillStrokePath();
-  void Handle_CloseEOFillStrokePath();
-  void Handle_EOFillStrokePath();
-  void Handle_BeginMarkedContent_Dictionary();
-  void Handle_BeginImage();
-  void Handle_BeginMarkedContent();
-  void Handle_BeginText();
-  void Handle_CurveTo_123();
-  void Handle_ConcatMatrix();
-  void Handle_SetColorSpace_Fill();
-  void Handle_SetColorSpace_Stroke();
-  void Handle_SetDash();
-  void Handle_SetCharWidth();
-  void Handle_SetCachedDevice();
-  void Handle_ExecuteXObject();
-  void Handle_MarkPlace_Dictionary();
-  void Handle_EndImage();
-  void Handle_EndMarkedContent();
-  void Handle_EndText();
-  void Handle_FillPath();
-  void Handle_FillPathOld();
-  void Handle_EOFillPath();
-  void Handle_SetGray_Fill();
-  void Handle_SetGray_Stroke();
-  void Handle_SetExtendGraphState();
-  void Handle_ClosePath();
-  void Handle_SetFlat();
-  void Handle_BeginImageData();
-  void Handle_SetLineJoin();
-  void Handle_SetLineCap();
-  void Handle_SetCMYKColor_Fill();
-  void Handle_SetCMYKColor_Stroke();
-  void Handle_LineTo();
-  void Handle_MoveTo();
-  void Handle_SetMiterLimit();
-  void Handle_MarkPlace();
-  void Handle_EndPath();
-  void Handle_SaveGraphState();
-  void Handle_RestoreGraphState();
-  void Handle_Rectangle();
-  void Handle_SetRGBColor_Fill();
-  void Handle_SetRGBColor_Stroke();
-  void Handle_SetRenderIntent();
-  void Handle_CloseStrokePath();
-  void Handle_StrokePath();
-  void Handle_SetColor_Fill();
-  void Handle_SetColor_Stroke();
-  void Handle_SetColorPS_Fill();
-  void Handle_SetColorPS_Stroke();
-  void Handle_ShadeFill();
-  void Handle_SetCharSpace();
-  void Handle_MoveTextPoint();
-  void Handle_MoveTextPoint_SetLeading();
-  void Handle_SetFont();
-  void Handle_ShowText();
-  void Handle_ShowText_Positioning();
-  void Handle_SetTextLeading();
-  void Handle_SetTextMatrix();
-  void Handle_SetTextRenderMode();
-  void Handle_SetTextRise();
-  void Handle_SetWordSpace();
-  void Handle_SetHorzScale();
-  void Handle_MoveToNextLine();
-  void Handle_CurveTo_23();
-  void Handle_SetLineWidth();
-  void Handle_Clip();
-  void Handle_EOClip();
-  void Handle_CurveTo_13();
-  void Handle_NextLineShowText();
-  void Handle_NextLineShowText_Space();
-  void Handle_Invalid();
-
-  CPDF_Document* const m_pDocument;
-  CPDF_Dictionary* m_pPageResources;
-  CPDF_Dictionary* m_pParentResources;
-  CPDF_Dictionary* m_pResources;
-  CPDF_PageObjectHolder* m_pObjectHolder;
-  int m_Level;
-  CFX_Matrix m_mtContentToUser;
-  CFX_FloatRect m_BBox;
-  ContentParam m_ParamBuf[PARAM_BUF_SIZE];
-  uint32_t m_ParamStartPos;
-  uint32_t m_ParamCount;
-  CPDF_StreamParser* m_pSyntax;
-  std::unique_ptr<CPDF_AllStates> m_pCurStates;
-  CPDF_ContentMark m_CurContentMark;
-  std::vector<std::unique_ptr<CPDF_TextObject>> m_ClipTextList;
-  CPDF_TextObject* m_pLastTextObject;
-  FX_FLOAT m_DefFontSize;
-  FX_PATHPOINT* m_pPathPoints;
-  int m_PathPointCount;
-  int m_PathAllocSize;
-  FX_FLOAT m_PathStartX;
-  FX_FLOAT m_PathStartY;
-  FX_FLOAT m_PathCurrentX;
-  FX_FLOAT m_PathCurrentY;
-  uint8_t m_PathClipType;
-  CFX_ByteString m_LastImageName;
-  CPDF_Image* m_pLastImage;
-  CPDF_Dictionary* m_pLastImageDict;
-  CPDF_Dictionary* m_pLastCloneImageDict;
-  bool m_bColored;
-  FX_FLOAT m_Type3Data[6];
-  bool m_bResourceMissing;
-  std::vector<std::unique_ptr<CPDF_AllStates>> m_StateStack;
-};
-
 class CPDF_ContentParser {
  public:
   enum ParseStatus { Ready, ToBeContinued, Done };