summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_page
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-03-23 15:41:39 -0400
committerDan Sinclair <dsinclair@chromium.org>2016-03-23 15:41:39 -0400
commita8a28e0702a1874d29d3c9f2b155bce1557eb4fd (patch)
tree2b2d412e95004a846c39b9f05b444bbfce05d0a8 /core/fpdfapi/fpdf_page
parent029ea3ef8e49244e0a6e80d38768764ce27bad30 (diff)
downloadpdfium-a8a28e0702a1874d29d3c9f2b155bce1557eb4fd.tar.xz
Move core/include/fxcrt to core/fxcrt/include.
This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 .
Diffstat (limited to 'core/fpdfapi/fpdf_page')
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_allstates.h4
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_colorstate.h4
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_colorstatedata.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_contentmark.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h4
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_parseoptions.h2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_textstate.h2
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_func.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp4
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_clippath.h6
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_formobject.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_generalstate.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h6
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_imageobject.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_page.h6
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_pageobject.h4
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h4
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_path.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_pathobject.h4
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_textobject.h4
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h2
23 files changed, 37 insertions, 37 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.h b/core/fpdfapi/fpdf_page/cpdf_allstates.h
index 700072f26c..9af917a113 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.h
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_
#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Array;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
index 77a506e1b4..e7f3e37d35 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
#include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Color;
class CPDF_ColorSpace;
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
index 304410b553..319fea51ae 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_system.h"
class CPDF_ColorStateData {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
index 35e4a9664b..056edc23a8 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_
#include "core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_ContentMark : public CFX_CountRef<CPDF_ContentMarkData> {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
index 4cf859fda9..773fea741b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
index 0a9ca1a04b..f46592d0a7 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
+++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
@@ -7,8 +7,8 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
index cd1bb69948..3d091ab7cf 100644
--- a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
+++ b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_ParseOptions {
public:
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.h b/core/fpdfapi/fpdf_page/cpdf_textstate.h
index 8530322aeb..cfb4b28a21 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_Font;
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
index 4bf7c06a7b..cea7d6b8e7 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
@@ -15,7 +15,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
-#include "core/include/fxcrt/fx_safe_types.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions_impl.h"
namespace {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 87ed09735a..c0d7c08ee1 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -24,9 +24,9 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
#include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
#include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_safe_types.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_safe_types.h"
CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize) {
m_pBuf = pData;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
index 4631e8266a..e265cd4ce0 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
@@ -9,9 +9,9 @@
#include "core/fpdfapi/fpdf_page/cpdf_clippathdata.h"
#include "core/fpdfapi/fpdf_page/include/cpdf_path.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_TextObject;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
index 47d40e0e8b..234cd73328 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_FORMOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class Form;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
index 3495b6c3ff..ab1e940089 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
class CPDF_GeneralState : public CFX_CountRef<CPDF_GeneralStateData> {
public:
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
index f2e5510ccc..df7560289c 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h
@@ -7,9 +7,9 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_dib.h"
class CPDF_TransferFunc;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
index dec60c9d9b..9b983cc05c 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_IMAGEOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_Image;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_page.h b/core/fpdfapi/fpdf_page/include/cpdf_page.h
index 5e27ba2ec7..3ede3c9404 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_page.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_page.h
@@ -8,9 +8,9 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGE_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/include/fxcrt/fx_basic.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Document;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
index 2f55547b47..8e7da81e90 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_TextObject;
class CPDF_PathObject;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
index b0ab376956..7ac9f2cea0 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGEOBJECTHOLDER_H_
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class IFX_Pause;
class CPDF_Dictionary;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h
index a90115486a..f13b2719b9 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
#include "core/include/fxge/fx_ge.h"
class CPDF_Path : public CFX_CountRef<CFX_PathData> {
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
index 30df0c2937..296cdf8317 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h
@@ -9,8 +9,8 @@
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
#include "core/fpdfapi/fpdf_page/include/cpdf_path.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_PathObject : public CPDF_PageObject {
public:
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
index f43a1e3a4f..ae2ee90083 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h
@@ -8,7 +8,7 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_SHADINGOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/include/fx_coordinates.h"
class CPDF_ShadingPattern;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
index 9aaa2f0160..bb268c1446 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
@@ -8,8 +8,8 @@
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTOBJECT_H_
#include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h"
-#include "core/include/fxcrt/fx_string.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/include/fx_system.h"
struct CPDF_TextObjectItem {
FX_DWORD m_CharCode;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
index 1fcc1fe8c2..feed1a043f 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
@@ -7,7 +7,7 @@
#ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_
#define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
class CPDF_Font;
class CPDF_Document;