Move core/include/fpdfapi/fpdf_pageobj.h into core/fpdfapi.

core/fpdfapi/fpdf_page/pageint.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 CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
 #include "core/fpdfapi/fpdf_page/cpdf_parseoptions.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/include/fpdfapi/fpdf_pageobj.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
+#include "core/include/fxge/fx_ge.h"
 
 class CPDF_AllStates;
 class CPDF_ParseOptions;
 class CPDF_IccProfile;
+class CPDF_ImageObject;
+class CPDF_Image;

[Tom Sepez, 2016/03/17 20:15:38]

nit: alphabetize.

[dsinclair, 2016/03/17 20:37:41]

Done.

+class CPDF_Font;
+class CPDF_ColorSpace;
+class CPDF_Pattern;
+class CPDF_TextObject;
+class CPDF_Form;
+class CPDF_Type3Char;
+class CPDF_StreamAcc;
+class CPDF_Patttern;
+class CPDF_FontEncoding;
 
 #define PARSE_STEP_LIMIT 100
 
 class CPDF_StreamParser {
  public:
   enum SyntaxType { EndOfData, Number, Keyword, Name, Others };
 
   CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize);
   ~CPDF_StreamParser();
 
@@ skipping 269 matching lines @@
   CPDF_ParseOptions m_Options;
   CPDF_Type3Char* m_pType3Char;
   FX_DWORD m_nStreams;
   std::unique_ptr<CPDF_StreamAcc> m_pSingleStream;
   std::vector<std::unique_ptr<CPDF_StreamAcc>> m_StreamArray;
   uint8_t* m_pData;
   FX_DWORD m_Size;
   FX_DWORD m_CurrentOffset;
   std::unique_ptr<CPDF_StreamContentParser> m_pParser;
 };
-class CPDF_AllStates : public CPDF_GraphicStates {
- public:
-  CPDF_AllStates();
-  ~CPDF_AllStates();
-  void Copy(const CPDF_AllStates& src);
-  void ProcessExtGS(CPDF_Dictionary* pGS, CPDF_StreamContentParser* pParser);
-  void SetLineDash(CPDF_Array*, FX_FLOAT, FX_FLOAT scale);
-  CFX_Matrix m_TextMatrix, m_CTM, m_ParentMatrix;
-  FX_FLOAT m_TextX, m_TextY, m_TextLineX, m_TextLineY;
-  FX_FLOAT m_TextLeading, m_TextRise, m_TextHorzScale;
-};
 
 class CPDF_DocPageData {
  public:
   explicit CPDF_DocPageData(CPDF_Document* pPDFDoc);
   ~CPDF_DocPageData();
 
   void Clear(FX_BOOL bRelease = FALSE);
   CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);
   CPDF_Font* GetStandardFont(const CFX_ByteStringC& fontName,
                              CPDF_FontEncoding* pEncoding);
@@ skipping 119 matching lines @@
 
  private:
   CPDF_ColorSpace* m_pBaseCS;
   CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_