Move core/fpdfapi/fpdf_edit to core/fpdfapi/edit

BUG=pdfium:603

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

11 files changed, 25 insertions, 25 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 9579f7477c..338ca5333b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -394,11 +394,11 @@ static_library("fpdfapi") {
     "core/fpdfapi/cpdf_modulemgr.h",
     "core/fpdfapi/cpdf_pagerendercontext.cpp",
     "core/fpdfapi/cpdf_pagerendercontext.h",
-    "core/fpdfapi/fpdf_edit/cpdf_creator.h",
-    "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp",
-    "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h",
-    "core/fpdfapi/fpdf_edit/editint.h",
-    "core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
+    "core/fpdfapi/edit/cpdf_creator.h",
+    "core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp",
+    "core/fpdfapi/edit/cpdf_pagecontentgenerator.h",
+    "core/fpdfapi/edit/editint.h",
+    "core/fpdfapi/edit/fpdf_edit_create.cpp",
     "core/fpdfapi/fpdf_font/cpdf_cidfont.cpp",
     "core/fpdfapi/fpdf_font/cpdf_cidfont.h",
     "core/fpdfapi/fpdf_font/cpdf_font.cpp",
diff --git a/core/fpdfapi/fpdf_edit/cpdf_creator.h b/core/fpdfapi/edit/cpdf_creator.h
index f81b043c60..5de3793eb5 100644
--- a/core/fpdfapi/fpdf_edit/cpdf_creator.h
+++ b/core/fpdfapi/edit/cpdf_creator.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_EDIT_CPDF_CREATOR_H_
-#define CORE_FPDFAPI_FPDF_EDIT_CPDF_CREATOR_H_
+#ifndef CORE_FPDFAPI_EDIT_CPDF_CREATOR_H_
+#define CORE_FPDFAPI_EDIT_CPDF_CREATOR_H_
 
 #include <memory>
 
@@ -98,4 +98,4 @@ class CPDF_Creator {
   int32_t m_FileVersion;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_EDIT_CPDF_CREATOR_H_
+#endif  // CORE_FPDFAPI_EDIT_CPDF_CREATOR_H_
diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 4a6944ba86..e5d9683da6 100644
--- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h"
+#include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
 
-#include "core/fpdfapi/fpdf_edit/cpdf_creator.h"
+#include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_page/cpdf_image.h"
 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
index 8dfc6101e1..21b1b74fe9 100644
--- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_EDIT_CPDF_PAGECONTENTGENERATOR_H_
-#define CORE_FPDFAPI_FPDF_EDIT_CPDF_PAGECONTENTGENERATOR_H_
+#ifndef CORE_FPDFAPI_EDIT_CPDF_PAGECONTENTGENERATOR_H_
+#define CORE_FPDFAPI_EDIT_CPDF_PAGECONTENTGENERATOR_H_
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fxcrt/fx_basic.h"
@@ -40,4 +40,4 @@ class CPDF_PageContentGenerator {
   CFX_ArrayTemplate<CPDF_PageObject*> m_pageObjects;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_EDIT_CPDF_PAGECONTENTGENERATOR_H_
+#endif  // CORE_FPDFAPI_EDIT_CPDF_PAGECONTENTGENERATOR_H_
diff --git a/core/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/edit/editint.h
index ac10958f22..f1f88f8b09 100644
--- a/core/fpdfapi/fpdf_edit/editint.h
+++ b/core/fpdfapi/edit/editint.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
-#define CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#ifndef CORE_FPDFAPI_EDIT_EDITINT_H_
+#define CORE_FPDFAPI_EDIT_EDITINT_H_
 
 #include <vector>
 
@@ -74,4 +74,4 @@ class CPDF_XRefStream {
   CFX_ByteTextBuf m_Buffer;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_EDIT_EDITINT_H_
+#endif  // CORE_FPDFAPI_EDIT_EDITINT_H_
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/edit/fpdf_edit_create.cpp
index 1eb4286aa1..32395a8728 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/edit/fpdf_edit_create.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_edit/editint.h"
+#include "core/fpdfapi/edit/editint.h"
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_edit/cpdf_creator.h"
+#include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
@@ -1935,7 +1935,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault) {
       m_pIDArray->Add(pID1->Clone());
     } else {
       std::vector<uint8_t> buffer =
-          PDF_GenerateFileID((uint32_t)(uintptr_t) this, m_dwLastObjNum);
+          PDF_GenerateFileID((uint32_t)(uintptr_t)this, m_dwLastObjNum);
       CFX_ByteString bsBuffer(buffer.data(), buffer.size());
       m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE));
     }
@@ -1950,7 +1950,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault) {
       return;
     }
     std::vector<uint8_t> buffer =
-        PDF_GenerateFileID((uint32_t)(uintptr_t) this, m_dwLastObjNum);
+        PDF_GenerateFileID((uint32_t)(uintptr_t)this, m_dwLastObjNum);
     CFX_ByteString bsBuffer(buffer.data(), buffer.size());
     m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE));
     return;
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 5356e1f5b5..ccdc897e17 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -10,7 +10,7 @@
 #include <utility>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_edit/cpdf_creator.h"
+#include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
diff --git a/core/fpdfapi/fpdf_parser/cfdf_document.cpp b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
index c8ed9edada..12d1e7f993 100644
--- a/core/fpdfapi/fpdf_parser/cfdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cfdf_document.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/fpdf_parser/cfdf_document.h"
 
-#include "core/fpdfapi/fpdf_edit/cpdf_creator.h"
+#include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h"
 #include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 89f247e9fe..88f31d8711 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   '+core/fpdftext',
   '+core/fpdfapi',
-  '+core/fpdfapi/fpdf_edit',
+  '+core/fpdfapi/edit',
   '+core/fpdfapi/fpdf_page',
   '+core/fpdfapi/fpdf_parser',
   '+core/fpdfapi/fpdf_render',
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 5f0fce6cfb..bc4013a263 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -10,7 +10,7 @@
 #include <memory>
 #include <utility>
 
-#include "core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.h"
+#include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index d0cdd89eab..d29f8d206c 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_edit/cpdf_creator.h"
+#include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"