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

pdfium.gyp

Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index fed93b7828fbe0baa1eaca956dde8a4d00276f9e..c27f64ca80c142a9466ab5316b52d849de906cc9 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -328,25 +328,63 @@
         'core/fpdfapi/fpdf_font/fpdf_font_cid.cpp',
         'core/fpdfapi/fpdf_font/ttgsubtable.cpp',
         'core/fpdfapi/fpdf_font/ttgsubtable.h',
+        'core/fpdfapi/fpdf_page/cpdf_allstates.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_allstates.h',
+        'core/fpdfapi/fpdf_page/cpdf_clippath.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_clippathdata.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_clippathdata.h',
+        'core/fpdfapi/fpdf_page/cpdf_colorstate.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_colorstate.h',
+        'core/fpdfapi/fpdf_page/cpdf_colorstatedata.cpp',
+        'core/fpdfpai/fpdf_page/cpdf_colorstatedata.h',
+        'core/fpdfapi/fpdf_page/cpdf_contentmark.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_contentmark.h',
+        'core/fpdfapi/fpdf_page/cpdf_contentmarkdata.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h',
+        'core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h',
         'core/fpdfapi/fpdf_page/cpdf_form.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_formobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_generalstate.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_generalstatedata.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_graphicstates.h',
+        'core/fpdfapi/fpdf_page/cpdf_graphstate.h',
+        'core/fpdfapi/fpdf_page/cpdf_imageobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_page.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_pageobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h',
-        'core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp',
         'core/fpdfapi/fpdf_page/cpdf_parseoptions.cpp',
         'core/fpdfapi/fpdf_page/cpdf_parseoptions.h',
-        'core/fpdfapi/fpdf_page/fpdf_page.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_pathobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_textobject.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_textstate.cpp',
+        'core/fpdfapi/fpdf_page/cpdf_textstate.h',
+        'core/fpdfapi/fpdf_page/cpdf_textstatedata.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_colors.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_doc.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_func.cpp',
-        'core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_image.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_parser.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp',
-        'core/fpdfapi/fpdf_page/fpdf_page_path.cpp',
         'core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp',
-        'core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_clippath.h',
         'core/fpdfapi/fpdf_page/include/cpdf_form.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_formobject.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_graphstate.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_imageobject.h',
         'core/fpdfapi/fpdf_page/include/cpdf_page.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_pageobject.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_path.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_pathobject.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_textobject.h',
+        'core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h',
         'core/fpdfapi/fpdf_page/pageint.h',
         'core/fpdfapi/fpdf_parser/cfdf_document.cpp',
         'core/fpdfapi/fpdf_parser/cpdf_array.cpp',
@@ -414,7 +452,6 @@
         'core/fpdfapi/include/cpdf_modulemgr.h',
         'core/fpdfapi/ipdf_rendermodule.h',
         'core/fpdfapi/ipdf_pagemodule.h',
-        'core/include/fpdfapi/fpdf_pageobj.h',
         'core/include/fpdfapi/fpdf_resource.h',
       ],
     },