Break core/fpdfapi/{edit,parser} circular dependence
Move a few files from edit to parser.
Change-Id: I8124ed9eac4bdc6666f21d3155da3a94f8ce561a
Reviewed-on: https://pdfium-review.googlesource.com/c/49591
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/edit/BUILD.gn b/core/fpdfapi/edit/BUILD.gn
index 2ef5fd9..9f74832 100644
--- a/core/fpdfapi/edit/BUILD.gn
+++ b/core/fpdfapi/edit/BUILD.gn
@@ -10,10 +10,6 @@
sources = [
"cpdf_creator.cpp",
"cpdf_creator.h",
- "cpdf_encryptor.cpp",
- "cpdf_encryptor.h",
- "cpdf_flateencoder.cpp",
- "cpdf_flateencoder.h",
"cpdf_pagecontentgenerator.cpp",
"cpdf_pagecontentgenerator.h",
"cpdf_pagecontentmanager.cpp",
@@ -30,7 +26,6 @@
"../page",
"../parser",
]
- allow_circular_includes_from = [ "../parser" ]
visibility = [ "../../../*" ]
}
diff --git a/core/fpdfapi/edit/cpdf_creator.cpp b/core/fpdfapi/edit/cpdf_creator.cpp
index fc3f186..da3a9d3 100644
--- a/core/fpdfapi/edit/cpdf_creator.cpp
+++ b/core/fpdfapi/edit/cpdf_creator.cpp
@@ -8,12 +8,12 @@
#include <algorithm>
-#include "core/fpdfapi/edit/cpdf_encryptor.h"
-#include "core/fpdfapi/edit/cpdf_flateencoder.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_crypto_handler.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
+#include "core/fpdfapi/parser/cpdf_encryptor.h"
+#include "core/fpdfapi/parser/cpdf_flateencoder.h"
#include "core/fpdfapi/parser/cpdf_number.h"
#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfapi/parser/cpdf_security_handler.h"
diff --git a/core/fpdfapi/parser/BUILD.gn b/core/fpdfapi/parser/BUILD.gn
index bc7769f..b0384d7 100644
--- a/core/fpdfapi/parser/BUILD.gn
+++ b/core/fpdfapi/parser/BUILD.gn
@@ -26,6 +26,10 @@
"cpdf_dictionary.h",
"cpdf_document.cpp",
"cpdf_document.h",
+ "cpdf_encryptor.cpp",
+ "cpdf_encryptor.h",
+ "cpdf_flateencoder.cpp",
+ "cpdf_flateencoder.h",
"cpdf_hint_tables.cpp",
"cpdf_hint_tables.h",
"cpdf_indirect_object_holder.cpp",
diff --git a/core/fpdfapi/edit/cpdf_encryptor.cpp b/core/fpdfapi/parser/cpdf_encryptor.cpp
similarity index 94%
rename from core/fpdfapi/edit/cpdf_encryptor.cpp
rename to core/fpdfapi/parser/cpdf_encryptor.cpp
index a89de72..706d668 100644
--- a/core/fpdfapi/edit/cpdf_encryptor.cpp
+++ b/core/fpdfapi/parser/cpdf_encryptor.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/edit/cpdf_encryptor.h"
+#include "core/fpdfapi/parser/cpdf_encryptor.h"
#include "core/fpdfapi/parser/cpdf_crypto_handler.h"
diff --git a/core/fpdfapi/edit/cpdf_encryptor.h b/core/fpdfapi/parser/cpdf_encryptor.h
similarity index 82%
rename from core/fpdfapi/edit/cpdf_encryptor.h
rename to core/fpdfapi/parser/cpdf_encryptor.h
index 4ace308..cea737a 100644
--- a/core/fpdfapi/edit/cpdf_encryptor.h
+++ b/core/fpdfapi/parser/cpdf_encryptor.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_EDIT_CPDF_ENCRYPTOR_H_
-#define CORE_FPDFAPI_EDIT_CPDF_ENCRYPTOR_H_
+#ifndef CORE_FPDFAPI_PARSER_CPDF_ENCRYPTOR_H_
+#define CORE_FPDFAPI_PARSER_CPDF_ENCRYPTOR_H_
#include <stdint.h>
@@ -28,4 +28,4 @@
const int m_ObjNum;
};
-#endif // CORE_FPDFAPI_EDIT_CPDF_ENCRYPTOR_H_
+#endif // CORE_FPDFAPI_PARSER_CPDF_ENCRYPTOR_H_
diff --git a/core/fpdfapi/edit/cpdf_flateencoder.cpp b/core/fpdfapi/parser/cpdf_flateencoder.cpp
similarity index 97%
rename from core/fpdfapi/edit/cpdf_flateencoder.cpp
rename to core/fpdfapi/parser/cpdf_flateencoder.cpp
index 7172bf2..f998105 100644
--- a/core/fpdfapi/edit/cpdf_flateencoder.cpp
+++ b/core/fpdfapi/parser/cpdf_flateencoder.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/edit/cpdf_flateencoder.h"
+#include "core/fpdfapi/parser/cpdf_flateencoder.h"
#include <memory>
#include <utility>
diff --git a/core/fpdfapi/edit/cpdf_flateencoder.h b/core/fpdfapi/parser/cpdf_flateencoder.h
similarity index 88%
rename from core/fpdfapi/edit/cpdf_flateencoder.h
rename to core/fpdfapi/parser/cpdf_flateencoder.h
index 5fc5fe9..85d77c7 100644
--- a/core/fpdfapi/edit/cpdf_flateencoder.h
+++ b/core/fpdfapi/parser/cpdf_flateencoder.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_EDIT_CPDF_FLATEENCODER_H_
-#define CORE_FPDFAPI_EDIT_CPDF_FLATEENCODER_H_
+#ifndef CORE_FPDFAPI_PARSER_CPDF_FLATEENCODER_H_
+#define CORE_FPDFAPI_PARSER_CPDF_FLATEENCODER_H_
#include <memory>
@@ -44,4 +44,4 @@
std::unique_ptr<CPDF_Dictionary> m_pClonedDict;
};
-#endif // CORE_FPDFAPI_EDIT_CPDF_FLATEENCODER_H_
+#endif // CORE_FPDFAPI_PARSER_CPDF_FLATEENCODER_H_
diff --git a/core/fpdfapi/parser/cpdf_stream.cpp b/core/fpdfapi/parser/cpdf_stream.cpp
index 0c6b5c4..65fd624 100644
--- a/core/fpdfapi/parser/cpdf_stream.cpp
+++ b/core/fpdfapi/parser/cpdf_stream.cpp
@@ -10,9 +10,9 @@
#include <vector>
#include "constants/stream_dict_common.h"
-#include "core/fpdfapi/edit/cpdf_encryptor.h"
-#include "core/fpdfapi/edit/cpdf_flateencoder.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
+#include "core/fpdfapi/parser/cpdf_encryptor.h"
+#include "core/fpdfapi/parser/cpdf_flateencoder.h"
#include "core/fpdfapi/parser/cpdf_number.h"
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
diff --git a/core/fpdfapi/parser/cpdf_string.cpp b/core/fpdfapi/parser/cpdf_string.cpp
index 5a6222e..2a7653e 100644
--- a/core/fpdfapi/parser/cpdf_string.cpp
+++ b/core/fpdfapi/parser/cpdf_string.cpp
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "core/fpdfapi/edit/cpdf_encryptor.h"
+#include "core/fpdfapi/parser/cpdf_encryptor.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/ptr_util.h"
