summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.gn14
-rw-r--r--xfa/fde/cfde_textout.cpp2
-rw-r--r--xfa/fde/cfde_txtedtengine.cpp2
-rw-r--r--xfa/fde/cfde_txtedtpage.cpp2
-rw-r--r--xfa/fde/cfde_txtedtparag.cpp2
-rw-r--r--xfa/fde/cfde_txtedttextset.cpp2
-rw-r--r--xfa/fgas/layout/cfx_linebreak.cpp (renamed from xfa/fgas/layout/fgas_linebreak.cpp)2
-rw-r--r--xfa/fgas/layout/cfx_linebreak.h (renamed from xfa/fgas/layout/fgas_linebreak.h)6
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.cpp (renamed from xfa/fgas/layout/fgas_rtfbreak.cpp)4
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.h (renamed from xfa/fgas/layout/fgas_rtfbreak.h)6
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak_unittest.cpp (renamed from xfa/fgas/layout/fgas_rtfbreak_unittest.cpp)8
-rw-r--r--xfa/fgas/layout/cfx_txtbreak.cpp (renamed from xfa/fgas/layout/fgas_textbreak.cpp)5
-rw-r--r--xfa/fgas/layout/cfx_txtbreak.h (renamed from xfa/fgas/layout/fgas_textbreak.h)6
-rw-r--r--xfa/fxfa/app/cxfa_textlayout.h2
14 files changed, 31 insertions, 32 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 9c370c258b..1246a7bca0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1444,12 +1444,12 @@ if (pdf_enable_xfa) {
"xfa/fgas/layout/cfx_breakline.h",
"xfa/fgas/layout/cfx_breakpiece.cpp",
"xfa/fgas/layout/cfx_breakpiece.h",
- "xfa/fgas/layout/fgas_linebreak.cpp",
- "xfa/fgas/layout/fgas_linebreak.h",
- "xfa/fgas/layout/fgas_rtfbreak.cpp",
- "xfa/fgas/layout/fgas_rtfbreak.h",
- "xfa/fgas/layout/fgas_textbreak.cpp",
- "xfa/fgas/layout/fgas_textbreak.h",
+ "xfa/fgas/layout/cfx_linebreak.cpp",
+ "xfa/fgas/layout/cfx_linebreak.h",
+ "xfa/fgas/layout/cfx_rtfbreak.cpp",
+ "xfa/fgas/layout/cfx_rtfbreak.h",
+ "xfa/fgas/layout/cfx_txtbreak.cpp",
+ "xfa/fgas/layout/cfx_txtbreak.h",
"xfa/fwl/cfwl_app.cpp",
"xfa/fwl/cfwl_app.h",
"xfa/fwl/cfwl_barcode.cpp",
@@ -1894,7 +1894,7 @@ test("pdfium_unittests") {
"xfa/fde/css/cfde_cssstylesheet_unittest.cpp",
"xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp",
"xfa/fde/xml/cfde_xmlsyntaxparser_unittest.cpp",
- "xfa/fgas/layout/fgas_rtfbreak_unittest.cpp",
+ "xfa/fgas/layout/cfx_rtfbreak_unittest.cpp",
"xfa/fxfa/app/cxfa_textparser_unittest.cpp",
"xfa/fxfa/cxfa_ffapp_unittest.cpp",
"xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp",
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index b85bfef3f6..d5706dd497 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -16,7 +16,7 @@
#include "xfa/fde/cfde_path.h"
#include "xfa/fde/cfde_pen.h"
#include "xfa/fde/cfde_renderdevice.h"
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
FDE_TTOPIECE::FDE_TTOPIECE() = default;
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp
index 86a501559f..84aafed433 100644
--- a/xfa/fde/cfde_txtedtengine.cpp
+++ b/xfa/fde/cfde_txtedtengine.cpp
@@ -17,7 +17,7 @@
#include "xfa/fde/cfde_txtedtdorecord_insert.h"
#include "xfa/fde/cfde_txtedtpage.h"
#include "xfa/fde/cfde_txtedtparag.h"
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
#include "xfa/fwl/cfwl_edit.h"
namespace {
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp
index 5bd731f8f5..faf52316c8 100644
--- a/xfa/fde/cfde_txtedtpage.cpp
+++ b/xfa/fde/cfde_txtedtpage.cpp
@@ -16,7 +16,7 @@
#include "xfa/fde/cfde_txtedtparag.h"
#include "xfa/fde/cfde_txtedttextset.h"
#include "xfa/fde/ifde_txtedtengine.h"
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
namespace {
diff --git a/xfa/fde/cfde_txtedtparag.cpp b/xfa/fde/cfde_txtedtparag.cpp
index bcacc66695..c6b13007c9 100644
--- a/xfa/fde/cfde_txtedtparag.cpp
+++ b/xfa/fde/cfde_txtedtparag.cpp
@@ -15,7 +15,7 @@
#include "xfa/fde/cfde_txtedtbuf.h"
#include "xfa/fde/cfde_txtedtengine.h"
#include "xfa/fde/ifde_txtedtengine.h"
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine)
: m_nCharStart(0),
diff --git a/xfa/fde/cfde_txtedttextset.cpp b/xfa/fde/cfde_txtedttextset.cpp
index ff7b39bb9f..dd68d42618 100644
--- a/xfa/fde/cfde_txtedttextset.cpp
+++ b/xfa/fde/cfde_txtedttextset.cpp
@@ -9,7 +9,7 @@
#include "xfa/fde/cfde_txtedtengine.h"
#include "xfa/fde/cfde_txtedtpage.h"
#include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
CFDE_TxtEdtTextSet::CFDE_TxtEdtTextSet(CFDE_TxtEdtPage* pPage)
: m_pPage(pPage) {}
diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/cfx_linebreak.cpp
index 2a9e3be522..9531bc55b0 100644
--- a/xfa/fgas/layout/fgas_linebreak.cpp
+++ b/xfa/fgas/layout/cfx_linebreak.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fgas/layout/fgas_linebreak.h"
+#include "xfa/fgas/layout/cfx_linebreak.h"
#include "core/fxcrt/fx_ucd.h"
diff --git a/xfa/fgas/layout/fgas_linebreak.h b/xfa/fgas/layout/cfx_linebreak.h
index 918c2e5caf..8ba022e71e 100644
--- a/xfa/fgas/layout/fgas_linebreak.h
+++ b/xfa/fgas/layout/cfx_linebreak.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_
-#define XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_
+#ifndef XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_
+#define XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_
#include "core/fxcrt/fx_system.h"
@@ -29,4 +29,4 @@ enum FX_LINEBREAKTYPE : uint8_t {
extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32];
-#endif // XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_
+#endif // XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index 842e729217..9acc082d8e 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fgas/layout/fgas_rtfbreak.h"
+#include "xfa/fgas/layout/cfx_rtfbreak.h"
#include <algorithm>
#include "core/fxcrt/fx_arabic.h"
#include "third_party/base/stl_util.h"
#include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fgas/layout/fgas_linebreak.h"
+#include "xfa/fgas/layout/cfx_linebreak.h"
CFX_RTFBreak::CFX_RTFBreak(uint32_t dwLayoutStyles)
: CFX_Break(dwLayoutStyles),
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h
index 7cbd250218..28adaa5d41 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/cfx_rtfbreak.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
-#define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
+#ifndef XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_
+#define XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_
#include <deque>
#include <vector>
@@ -95,4 +95,4 @@ class CFX_RTFBreak : public CFX_Break {
CFX_RetainPtr<CFX_Retainable> m_pUserData;
};
-#endif // XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
+#endif // XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_
diff --git a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
index cc3c86cadb..c8ffc4eb33 100644
--- a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fgas/layout/fgas_rtfbreak.h"
+#include "xfa/fgas/layout/cfx_rtfbreak.h"
#include <memory>
@@ -14,7 +14,7 @@
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fgas/font/cfgas_gefont.h"
-class RTFBreakTest : public testing::Test {
+class CFX_RTFBreakTest : public testing::Test {
public:
void SetUp() override {
CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo(
@@ -49,7 +49,7 @@ class RTFBreakTest : public testing::Test {
// As soon as you get one of the control characters the break is complete
// and must be consumed before you get any more characters ....
-TEST_F(RTFBreakTest, AddChars) {
+TEST_F(CFX_RTFBreakTest, AddChars) {
auto b = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
CFX_WideString str(L"Input String.");
@@ -74,7 +74,7 @@ TEST_F(RTFBreakTest, AddChars) {
EXPECT_EQ(str, b->GetBreakPieceUnstable(0)->GetString());
}
-TEST_F(RTFBreakTest, ControlCharacters) {
+TEST_F(CFX_RTFBreakTest, ControlCharacters) {
auto b = CreateBreak(FX_LAYOUTSTYLE_ExpandTab);
EXPECT_EQ(CFX_BreakType::Line, b->AppendChar(L'\v'));
EXPECT_EQ(CFX_BreakType::Page, b->AppendChar(L'\f'));
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index 83a03eed5e..e898a22991 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fgas/layout/fgas_textbreak.h"
+#include "xfa/fgas/layout/cfx_txtbreak.h"
#include <algorithm>
@@ -12,7 +12,7 @@
#include "core/fxcrt/fx_memory.h"
#include "third_party/base/ptr_util.h"
#include "xfa/fgas/font/cfgas_gefont.h"
-#include "xfa/fgas/layout/fgas_linebreak.h"
+#include "xfa/fgas/layout/cfx_linebreak.h"
namespace {
@@ -35,7 +35,6 @@ void CFX_TxtBreak::SetLineWidth(float fLineWidth) {
ASSERT(m_iLineWidth >= 20000);
}
-
void CFX_TxtBreak::SetAlignment(int32_t iAlignment) {
ASSERT(iAlignment >= CFX_TxtLineAlignment_Left &&
iAlignment <= CFX_TxtLineAlignment_Justified);
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/cfx_txtbreak.h
index 81aaf58219..0f11844453 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/cfx_txtbreak.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
-#define XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
+#ifndef XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_
+#define XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_
#include <deque>
#include <memory>
@@ -99,4 +99,4 @@ class CFX_TxtBreak : public CFX_Break {
int32_t m_iCombWidth;
};
-#endif // XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_
+#endif // XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_
diff --git a/xfa/fxfa/app/cxfa_textlayout.h b/xfa/fxfa/app/cxfa_textlayout.h
index 9bfc977247..5bce1c9ab2 100644
--- a/xfa/fxfa/app/cxfa_textlayout.h
+++ b/xfa/fxfa/app/cxfa_textlayout.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "xfa/fde/css/fde_css.h"
-#include "xfa/fgas/layout/fgas_rtfbreak.h"
+#include "xfa/fgas/layout/cfx_rtfbreak.h"
#include "xfa/fxfa/app/cxfa_textparser.h"
class CFDE_Brush;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:06:09 +0000