summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.gn13
-rw-r--r--xfa/fde/cfde_brush.h23
-rw-r--r--xfa/fde/cfde_path.cpp1
-rw-r--r--xfa/fde/cfde_pen.h (renamed from xfa/fde/fde_object.h)21
-rw-r--r--xfa/fde/cfde_rendercontext.cpp (renamed from xfa/fde/fde_render.cpp)7
-rw-r--r--xfa/fde/cfde_rendercontext.h (renamed from xfa/fde/fde_render.h)12
-rw-r--r--xfa/fde/cfde_renderdevice.cpp (renamed from xfa/fde/fde_gedevice.cpp)6
-rw-r--r--xfa/fde/cfde_renderdevice.h (renamed from xfa/fde/fde_gedevice.h)6
-rw-r--r--xfa/fde/cfde_txtedtpage.h2
-rw-r--r--xfa/fde/cfde_txtedttextset.h2
-rw-r--r--xfa/fde/cfde_visualsetiterator.cpp (renamed from xfa/fde/fde_iterator.cpp)2
-rw-r--r--xfa/fde/cfde_visualsetiterator.h (renamed from xfa/fde/fde_iterator.h)8
-rw-r--r--xfa/fde/ifde_visualset.h (renamed from xfa/fde/fde_visualset.h)7
-rw-r--r--xfa/fde/tto/fde_textout.cpp7
-rw-r--r--xfa/fde/tto/fde_textout.h2
-rw-r--r--xfa/fwl/cfwl_edit.cpp4
-rw-r--r--xfa/fxfa/app/cxfa_textlayout.cpp5
-rw-r--r--xfa/fxfa/cxfa_ffpageview.cpp2
18 files changed, 71 insertions, 59 deletions
diff --git a/BUILD.gn b/BUILD.gn
index bed74a05e7..cd3c724eb9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1299,8 +1299,13 @@ if (pdf_enable_xfa) {
static_library("xfa") {
sources = [
+ "xfa/fde/cfde_brush.h",
"xfa/fde/cfde_path.cpp",
"xfa/fde/cfde_path.h",
+ "xfa/fde/cfde_pen.h",
+ "xfa/fde/cfde_rendercontext.cpp",
+ "xfa/fde/cfde_rendercontext.h",
+ "xfa/fde/cfde_renderdevice.cpp",
"xfa/fde/cfde_txtedtbuf.cpp",
"xfa/fde/cfde_txtedtbuf.h",
"xfa/fde/cfde_txtedtdorecord_deleterange.cpp",
@@ -1315,6 +1320,8 @@ if (pdf_enable_xfa) {
"xfa/fde/cfde_txtedtparag.h",
"xfa/fde/cfde_txtedttextset.cpp",
"xfa/fde/cfde_txtedttextset.h",
+ "xfa/fde/cfde_visualsetiterator.cpp",
+ "xfa/fde/cfde_visualsetiterator.h",
"xfa/fde/cfx_chariter.cpp",
"xfa/fde/cfx_chariter.h",
"xfa/fde/cfx_wordbreak.cpp",
@@ -1358,12 +1365,6 @@ if (pdf_enable_xfa) {
"xfa/fde/css/fde_css.h",
"xfa/fde/css/fde_cssdatatable.cpp",
"xfa/fde/css/fde_cssdatatable.h",
- "xfa/fde/fde_gedevice.cpp",
- "xfa/fde/fde_iterator.cpp",
- "xfa/fde/fde_iterator.h",
- "xfa/fde/fde_object.h",
- "xfa/fde/fde_render.cpp",
- "xfa/fde/fde_render.h",
"xfa/fde/ifde_txtedtdorecord.h",
"xfa/fde/ifde_txtedtengine.h",
"xfa/fde/ifde_txtedtpage.h",
diff --git a/xfa/fde/cfde_brush.h b/xfa/fde/cfde_brush.h
new file mode 100644
index 0000000000..7a070c8605
--- /dev/null
+++ b/xfa/fde/cfde_brush.h
@@ -0,0 +1,23 @@
+// Copyright 2017 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FDE_CFDE_BRUSH_H_
+#define XFA_FDE_CFDE_BRUSH_H_
+
+#include "core/fxge/fx_dib.h"
+
+class CFDE_Brush {
+ public:
+ CFDE_Brush() : m_Color(0xFF000000) {}
+
+ FX_ARGB GetColor() const { return m_Color; }
+ void SetColor(FX_ARGB color) { m_Color = color; }
+
+ private:
+ FX_ARGB m_Color;
+};
+
+#endif // XFA_FDE_CFDE_BRUSH_H_
diff --git a/xfa/fde/cfde_path.cpp b/xfa/fde/cfde_path.cpp
index 32f67e31a0..4afa718978 100644
--- a/xfa/fde/cfde_path.cpp
+++ b/xfa/fde/cfde_path.cpp
@@ -7,7 +7,6 @@
#include "xfa/fde/cfde_path.h"
#include "third_party/base/stl_util.h"
-#include "xfa/fde/fde_object.h"
void CFDE_Path::CloseFigure() {
m_Path.ClosePath();
diff --git a/xfa/fde/fde_object.h b/xfa/fde/cfde_pen.h
index 5c66b202b6..ac49571bd0 100644
--- a/xfa/fde/fde_object.h
+++ b/xfa/fde/cfde_pen.h
@@ -1,27 +1,14 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// Copyright 2017 PDFium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FDE_FDE_OBJECT_H_
-#define XFA_FDE_FDE_OBJECT_H_
-
-#include <cstdint>
+#ifndef XFA_FDE_CFDE_PEN_H_
+#define XFA_FDE_CFDE_PEN_H_
#include "core/fxge/fx_dib.h"
-class CFDE_Brush {
- public:
- CFDE_Brush() : m_Color(0xFF000000) {}
-
- FX_ARGB GetColor() const { return m_Color; }
- void SetColor(FX_ARGB color) { m_Color = color; }
-
- private:
- FX_ARGB m_Color;
-};
-
class CFDE_Pen {
public:
CFDE_Pen() : m_Color(0) {}
@@ -34,4 +21,4 @@ class CFDE_Pen {
FX_ARGB m_Color;
};
-#endif // XFA_FDE_FDE_OBJECT_H_
+#endif // XFA_FDE_CFDE_PEN_H_
diff --git a/xfa/fde/fde_render.cpp b/xfa/fde/cfde_rendercontext.cpp
index a502c7b6d8..2e690e0ed9 100644
--- a/xfa/fde/fde_render.cpp
+++ b/xfa/fde/cfde_rendercontext.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fde/fde_render.h"
+#include "xfa/fde/cfde_rendercontext.h"
#include "third_party/base/ptr_util.h"
+#include "xfa/fde/cfde_brush.h"
+#include "xfa/fde/cfde_renderdevice.h"
#include "xfa/fde/cfde_txtedttextset.h"
-#include "xfa/fde/fde_gedevice.h"
-#include "xfa/fde/fde_object.h"
#define FDE_PATHRENDER_Stroke 1
#define FDE_PATHRENDER_Fill 2
@@ -126,4 +126,3 @@ void CFDE_RenderContext::RenderText(CFDE_TxtEdtTextSet* pTextSet,
m_pRenderDevice->DrawString(m_pBrush.get(), pFont, m_CharPos.data(), iCount,
fFontSize, &m_Transform);
}
-
diff --git a/xfa/fde/fde_render.h b/xfa/fde/cfde_rendercontext.h
index ba56754a3e..28b8780052 100644
--- a/xfa/fde/fde_render.h
+++ b/xfa/fde/cfde_rendercontext.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FDE_FDE_RENDER_H_
-#define XFA_FDE_FDE_RENDER_H_
+#ifndef XFA_FDE_CFDE_RENDERCONTEXT_H_
+#define XFA_FDE_CFDE_RENDERCONTEXT_H_
#include <memory>
#include <vector>
#include "core/fxcrt/fx_coordinates.h"
-#include "xfa/fde/fde_gedevice.h"
-#include "xfa/fde/fde_iterator.h"
-#include "xfa/fde/fde_visualset.h"
+#include "xfa/fde/cfde_renderdevice.h"
+#include "xfa/fde/cfde_visualsetiterator.h"
+#include "xfa/fde/ifde_visualset.h"
class CFDE_RenderDevice;
class CFDE_TxtEdtTextSet;
@@ -47,4 +47,4 @@ class CFDE_RenderContext {
std::unique_ptr<CFDE_VisualSetIterator> m_pIterator;
};
-#endif // XFA_FDE_FDE_RENDER_H_
+#endif // XFA_FDE_CFDE_RENDERCONTEXT_H_
diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/cfde_renderdevice.cpp
index 8af769aae5..d3456e17cb 100644
--- a/xfa/fde/fde_gedevice.cpp
+++ b/xfa/fde/cfde_renderdevice.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fde/fde_gedevice.h"
+#include "xfa/fde/cfde_renderdevice.h"
#include <algorithm>
#include <memory>
@@ -13,8 +13,9 @@
#include "core/fxge/cfx_graphstatedata.h"
#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/cfx_substfont.h"
+#include "xfa/fde/cfde_brush.h"
#include "xfa/fde/cfde_path.h"
-#include "xfa/fde/fde_object.h"
+#include "xfa/fde/cfde_pen.h"
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fgas/font/cfgas_gefont.h"
@@ -352,4 +353,3 @@ bool CFDE_RenderDevice::FillPath(CFDE_Brush* pBrush,
return m_pDevice->DrawPath(&pGePath->m_Path, pMatrix, nullptr,
pBrush->GetColor(), 0, FXFILL_WINDING);
}
-
diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/cfde_renderdevice.h
index a3a1eaf111..f429ac1703 100644
--- a/xfa/fde/fde_gedevice.h
+++ b/xfa/fde/cfde_renderdevice.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FDE_FDE_GEDEVICE_H_
-#define XFA_FDE_FDE_GEDEVICE_H_
+#ifndef XFA_FDE_CFDE_RENDERDEVICE_H_
+#define XFA_FDE_CFDE_RENDERDEVICE_H_
#include <vector>
@@ -124,4 +124,4 @@ class CFDE_RenderDevice {
int32_t m_iCharCount;
};
-#endif // XFA_FDE_FDE_GEDEVICE_H_
+#endif // XFA_FDE_CFDE_RENDERDEVICE_H_
diff --git a/xfa/fde/cfde_txtedtpage.h b/xfa/fde/cfde_txtedtpage.h
index 2cae7ce4ab..699a9086ce 100644
--- a/xfa/fde/cfde_txtedtpage.h
+++ b/xfa/fde/cfde_txtedtpage.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "xfa/fde/fde_visualset.h"
+#include "xfa/fde/ifde_visualset.h"
#include "xfa/fde/ifx_chariter.h"
class CFDE_TxtEdtEngine;
diff --git a/xfa/fde/cfde_txtedttextset.h b/xfa/fde/cfde_txtedttextset.h
index 35f7472b1f..8e4c4d01bf 100644
--- a/xfa/fde/cfde_txtedttextset.h
+++ b/xfa/fde/cfde_txtedttextset.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "xfa/fde/fde_visualset.h"
+#include "xfa/fde/ifde_visualset.h"
class CFDE_TxtEdtPage;
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/cfde_visualsetiterator.cpp
index ff4fc0e73c..5fd84ede8a 100644
--- a/xfa/fde/fde_iterator.cpp
+++ b/xfa/fde/cfde_visualsetiterator.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fde/fde_iterator.h"
+#include "xfa/fde/cfde_visualsetiterator.h"
#include "xfa/fde/cfde_txtedtpage.h"
diff --git a/xfa/fde/fde_iterator.h b/xfa/fde/cfde_visualsetiterator.h
index 99f9597aa5..a8e311aafb 100644
--- a/xfa/fde/fde_iterator.h
+++ b/xfa/fde/cfde_visualsetiterator.h
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FDE_FDE_ITERATOR_H_
-#define XFA_FDE_FDE_ITERATOR_H_
+#ifndef XFA_FDE_CFDE_VISUALSETITERATOR_H_
+#define XFA_FDE_CFDE_VISUALSETITERATOR_H_
#include <stack>
-#include "xfa/fde/fde_visualset.h"
+#include "xfa/fde/ifde_visualset.h"
class CFDE_TxtEdtPage;
@@ -37,4 +37,4 @@ class CFDE_VisualSetIterator {
std::stack<FDE_CANVASITEM> m_CanvasStack;
};
-#endif // XFA_FDE_FDE_ITERATOR_H_
+#endif // XFA_FDE_CFDE_VISUALSETITERATOR_H_
diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/ifde_visualset.h
index e9ee9ab815..144475f047 100644
--- a/xfa/fde/fde_visualset.h
+++ b/xfa/fde/ifde_visualset.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FDE_FDE_VISUALSET_H_
-#define XFA_FDE_FDE_VISUALSET_H_
+#ifndef XFA_FDE_IFDE_VISUALSET_H_
+#define XFA_FDE_IFDE_VISUALSET_H_
#include <vector>
@@ -14,7 +14,6 @@
#include "core/fxcrt/fx_system.h"
#include "core/fxge/fx_dib.h"
#include "xfa/fde/cfde_path.h"
-#include "xfa/fde/fde_object.h"
#include "xfa/fgas/font/cfgas_fontmgr.h"
class FXTEXT_CHARPOS;
@@ -47,4 +46,4 @@ class IFDE_VisualSet {
virtual CFX_RectF GetRect(const FDE_TEXTEDITPIECE& hVisualObj) = 0;
};
-#endif // XFA_FDE_FDE_VISUALSET_H_
+#endif // XFA_FDE_IFDE_VISUALSET_H_
diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp
index c06a12fedf..c036c77931 100644
--- a/xfa/fde/tto/fde_textout.cpp
+++ b/xfa/fde/tto/fde_textout.cpp
@@ -12,13 +12,16 @@
#include "core/fxcrt/fx_system.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
+#include "xfa/fde/cfde_brush.h"
#include "xfa/fde/cfde_path.h"
-#include "xfa/fde/fde_gedevice.h"
-#include "xfa/fde/fde_object.h"
+#include "xfa/fde/cfde_pen.h"
+#include "xfa/fde/cfde_renderdevice.h"
#include "xfa/fgas/layout/fgas_textbreak.h"
FDE_TTOPIECE::FDE_TTOPIECE() = default;
+
FDE_TTOPIECE::FDE_TTOPIECE(const FDE_TTOPIECE& that) = default;
+
FDE_TTOPIECE::~FDE_TTOPIECE() = default;
CFDE_TextOut::CFDE_TextOut()
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h
index e48e25567e..2ca77217a6 100644
--- a/xfa/fde/tto/fde_textout.h
+++ b/xfa/fde/tto/fde_textout.h
@@ -15,7 +15,6 @@
#include "core/fxge/cfx_fxgedevice.h"
#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/fx_dib.h"
-#include "xfa/fde/fde_object.h"
#include "xfa/fgas/font/cfgas_fontmgr.h"
#define FDE_TTOSTYLE_Underline 0x0001
@@ -38,6 +37,7 @@
#define FDE_TTOALIGNMENT_BottomRight 10
#define FDE_TTOALIGNMENT_BottomAuto 11
+class CFDE_Pen;
class CFDE_RenderDevice;
class CFX_RenderDevice;
class CFX_TxtBreak;
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 4af2eb0282..e05f251310 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -13,10 +13,10 @@
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
+#include "xfa/fde/cfde_rendercontext.h"
+#include "xfa/fde/cfde_renderdevice.h"
#include "xfa/fde/cfde_txtedtengine.h"
#include "xfa/fde/cfde_txtedtpage.h"
-#include "xfa/fde/fde_gedevice.h"
-#include "xfa/fde/fde_render.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fwl/cfwl_app.h"
#include "xfa/fwl/cfwl_caret.h"
diff --git a/xfa/fxfa/app/cxfa_textlayout.cpp b/xfa/fxfa/app/cxfa_textlayout.cpp
index c5471971b6..c8ed4f7f46 100644
--- a/xfa/fxfa/app/cxfa_textlayout.cpp
+++ b/xfa/fxfa/app/cxfa_textlayout.cpp
@@ -11,11 +11,12 @@
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
+#include "xfa/fde/cfde_brush.h"
#include "xfa/fde/cfde_path.h"
+#include "xfa/fde/cfde_pen.h"
+#include "xfa/fde/cfde_renderdevice.h"
#include "xfa/fde/css/cfde_csscomputedstyle.h"
#include "xfa/fde/css/cfde_cssstyleselector.h"
-#include "xfa/fde/fde_gedevice.h"
-#include "xfa/fde/fde_object.h"
#include "xfa/fde/xml/fde_xml_imp.h"
#include "xfa/fxfa/app/cxfa_linkuserdata.h"
#include "xfa/fxfa/app/cxfa_loadercontext.h"
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index 0066086d94..49033bc0de 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -12,7 +12,7 @@
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
-#include "xfa/fde/fde_render.h"
+#include "xfa/fde/cfde_rendercontext.h"
#include "xfa/fxfa/app/xfa_ffcheckbutton.h"
#include "xfa/fxfa/app/xfa_ffchoicelist.h"
#include "xfa/fxfa/app/xfa_fffield.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 05:07:42 +0000