Move core/fpdfapi/fpdf_page to core/fpdfapi/page

BUG=pdfium:603

Review-Url: https://codereview.chromium.org/2386423004

1 files changed, 64 insertions, 64 deletions

diff --git a/BUILD.gn b/BUILD.gn
index d440c2648c..16ef8e5ecb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -420,67 +420,6 @@ static_library("fpdfapi") {
     "core/fpdfapi/font/fpdf_font_cid.cpp",
     "core/fpdfapi/font/ttgsubtable.cpp",
     "core/fpdfapi/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_clippath.h",
-    "core/fpdfapi/fpdf_page/cpdf_color.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_color.h",
-    "core/fpdfapi/fpdf_page/cpdf_colorspace.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_colorspace.h",
-    "core/fpdfapi/fpdf_page/cpdf_colorstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_colorstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_contentmark.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_contentmark.h",
-    "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h",
-    "core/fpdfapi/fpdf_page/cpdf_countedobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_form.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_form.h",
-    "core/fpdfapi/fpdf_page/cpdf_formobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_formobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_generalstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_generalstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_graphicstates.h",
-    "core/fpdfapi/fpdf_page/cpdf_image.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_image.h",
-    "core/fpdfapi/fpdf_page/cpdf_imageobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_imageobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_meshstream.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_meshstream.h",
-    "core/fpdfapi/fpdf_page/cpdf_page.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_page.h",
-    "core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h",
-    "core/fpdfapi/fpdf_page/cpdf_path.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_path.h",
-    "core/fpdfapi/fpdf_page/cpdf_pathobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pathobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_pattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pattern.h",
-    "core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_shadingobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h",
-    "core/fpdfapi/fpdf_page/cpdf_textobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_textobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_textstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_textstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_tilingpattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h",
-    "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_parser.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
-    "core/fpdfapi/fpdf_page/pageint.h",
     "core/fpdfapi/fpdf_parser/cfdf_document.cpp",
     "core/fpdfapi/fpdf_parser/cfdf_document.h",
     "core/fpdfapi/fpdf_parser/cpdf_array.cpp",
@@ -543,6 +482,67 @@ static_library("fpdfapi") {
     "core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_text.cpp",
     "core/fpdfapi/fpdf_render/render_int.h",
+    "core/fpdfapi/page/cpdf_allstates.cpp",
+    "core/fpdfapi/page/cpdf_allstates.h",
+    "core/fpdfapi/page/cpdf_clippath.cpp",
+    "core/fpdfapi/page/cpdf_clippath.h",
+    "core/fpdfapi/page/cpdf_color.cpp",
+    "core/fpdfapi/page/cpdf_color.h",
+    "core/fpdfapi/page/cpdf_colorspace.cpp",
+    "core/fpdfapi/page/cpdf_colorspace.h",
+    "core/fpdfapi/page/cpdf_colorstate.cpp",
+    "core/fpdfapi/page/cpdf_colorstate.h",
+    "core/fpdfapi/page/cpdf_contentmark.cpp",
+    "core/fpdfapi/page/cpdf_contentmark.h",
+    "core/fpdfapi/page/cpdf_contentmarkitem.cpp",
+    "core/fpdfapi/page/cpdf_contentmarkitem.h",
+    "core/fpdfapi/page/cpdf_countedobject.h",
+    "core/fpdfapi/page/cpdf_form.cpp",
+    "core/fpdfapi/page/cpdf_form.h",
+    "core/fpdfapi/page/cpdf_formobject.cpp",
+    "core/fpdfapi/page/cpdf_formobject.h",
+    "core/fpdfapi/page/cpdf_generalstate.cpp",
+    "core/fpdfapi/page/cpdf_generalstate.h",
+    "core/fpdfapi/page/cpdf_graphicstates.cpp",
+    "core/fpdfapi/page/cpdf_graphicstates.h",
+    "core/fpdfapi/page/cpdf_image.cpp",
+    "core/fpdfapi/page/cpdf_image.h",
+    "core/fpdfapi/page/cpdf_imageobject.cpp",
+    "core/fpdfapi/page/cpdf_imageobject.h",
+    "core/fpdfapi/page/cpdf_meshstream.cpp",
+    "core/fpdfapi/page/cpdf_meshstream.h",
+    "core/fpdfapi/page/cpdf_page.cpp",
+    "core/fpdfapi/page/cpdf_page.h",
+    "core/fpdfapi/page/cpdf_pagemodule.cpp",
+    "core/fpdfapi/page/cpdf_pagemodule.h",
+    "core/fpdfapi/page/cpdf_pageobject.cpp",
+    "core/fpdfapi/page/cpdf_pageobject.h",
+    "core/fpdfapi/page/cpdf_pageobjectholder.cpp",
+    "core/fpdfapi/page/cpdf_pageobjectholder.h",
+    "core/fpdfapi/page/cpdf_pageobjectlist.cpp",
+    "core/fpdfapi/page/cpdf_pageobjectlist.h",
+    "core/fpdfapi/page/cpdf_path.cpp",
+    "core/fpdfapi/page/cpdf_path.h",
+    "core/fpdfapi/page/cpdf_pathobject.cpp",
+    "core/fpdfapi/page/cpdf_pathobject.h",
+    "core/fpdfapi/page/cpdf_pattern.cpp",
+    "core/fpdfapi/page/cpdf_pattern.h",
+    "core/fpdfapi/page/cpdf_shadingobject.cpp",
+    "core/fpdfapi/page/cpdf_shadingobject.h",
+    "core/fpdfapi/page/cpdf_shadingpattern.cpp",
+    "core/fpdfapi/page/cpdf_shadingpattern.h",
+    "core/fpdfapi/page/cpdf_textobject.cpp",
+    "core/fpdfapi/page/cpdf_textobject.h",
+    "core/fpdfapi/page/cpdf_textstate.cpp",
+    "core/fpdfapi/page/cpdf_textstate.h",
+    "core/fpdfapi/page/cpdf_tilingpattern.cpp",
+    "core/fpdfapi/page/cpdf_tilingpattern.h",
+    "core/fpdfapi/page/fpdf_page_colors.cpp",
+    "core/fpdfapi/page/fpdf_page_doc.cpp",
+    "core/fpdfapi/page/fpdf_page_func.cpp",
+    "core/fpdfapi/page/fpdf_page_parser.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_old.cpp",
+    "core/fpdfapi/page/pageint.h",
   ]
   configs += [ ":pdfium_core_config" ]
   deps = [
@@ -1638,14 +1638,14 @@ test("pdfium_unittests") {
   sources = [
     "core/fpdfapi/font/fpdf_font_cid_unittest.cpp",
     "core/fpdfapi/font/fpdf_font_unittest.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_array_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_old_unittest.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_unittest.cpp",
     "core/fpdfdoc/cpdf_filespec_unittest.cpp",
     "core/fpdfdoc/cpdf_formfield_unittest.cpp",
     "core/fpdftext/fpdf_text_int_unittest.cpp",
@@ -1705,12 +1705,12 @@ test("pdfium_unittests") {
 
 test("pdfium_embeddertests") {
   sources = [
-    "core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_security_handler_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
+    "core/fpdfapi/page/fpdf_page_func_embeddertest.cpp",
     "core/fxcodec/codec/fx_codec_embeddertest.cpp",
     "core/fxge/ge/fx_ge_text_embeddertest.cpp",
     "fpdfsdk/fpdf_dataavail_embeddertest.cpp",