summaryrefslogtreecommitdiff
path: root/xfa/fde
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fde')
-rw-r--r--xfa/fde/cfde_texteditengine.cpp2
-rw-r--r--xfa/fde/cfde_texteditengine.h8
-rw-r--r--xfa/fde/cfde_texteditengine_unittest.cpp2
-rw-r--r--xfa/fde/cfde_textout.cpp8
-rw-r--r--xfa/fde/cfde_textout.h6
5 files changed, 13 insertions, 13 deletions
diff --git a/xfa/fde/cfde_texteditengine.cpp b/xfa/fde/cfde_texteditengine.cpp
index 143bac49f9..d54126f3c3 100644
--- a/xfa/fde/cfde_texteditengine.cpp
+++ b/xfa/fde/cfde_texteditengine.cpp
@@ -623,7 +623,7 @@ void CFDE_TextEditEngine::SetCharacterLimit(size_t limit) {
is_dirty_ = true;
}
-void CFDE_TextEditEngine::SetFont(CFX_RetainPtr<CFGAS_GEFont> font) {
+void CFDE_TextEditEngine::SetFont(RetainPtr<CFGAS_GEFont> font) {
if (font_ == font)
return;
diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h
index dbb12f3953..7b739be711 100644
--- a/xfa/fde/cfde_texteditengine.h
+++ b/xfa/fde/cfde_texteditengine.h
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/retain_ptr.h"
#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/fx_dib.h"
#include "xfa/fgas/font/cfgas_gefont.h"
@@ -96,8 +96,8 @@ class CFDE_TextEditEngine {
CFX_RectF GetContentsBoundingBox();
void SetAvailableWidth(size_t width);
- void SetFont(CFX_RetainPtr<CFGAS_GEFont> font);
- CFX_RetainPtr<CFGAS_GEFont> GetFont() const { return font_; }
+ void SetFont(RetainPtr<CFGAS_GEFont> font);
+ RetainPtr<CFGAS_GEFont> GetFont() const { return font_; }
void SetFontSize(float size);
float GetFontSize() const { return font_size_; }
void SetFontColor(FX_ARGB color) { font_color_ = color; }
@@ -204,7 +204,7 @@ class CFDE_TextEditEngine {
std::vector<FDE_TEXTEDITPIECE> text_piece_info_;
std::vector<size_t> char_widths_;
CFX_TxtBreak text_break_;
- CFX_RetainPtr<CFGAS_GEFont> font_;
+ RetainPtr<CFGAS_GEFont> font_;
FX_ARGB font_color_;
float font_size_;
float line_spacing_;
diff --git a/xfa/fde/cfde_texteditengine_unittest.cpp b/xfa/fde/cfde_texteditengine_unittest.cpp
index b0a27f331c..e6cff04507 100644
--- a/xfa/fde/cfde_texteditengine_unittest.cpp
+++ b/xfa/fde/cfde_texteditengine_unittest.cpp
@@ -49,7 +49,7 @@ class CFDE_TextEditEngineTest : public testing::Test {
CFDE_TextEditEngine* engine() const { return engine_.get(); }
private:
- CFX_RetainPtr<CFGAS_GEFont> font_;
+ RetainPtr<CFGAS_GEFont> font_;
std::unique_ptr<CFDE_TextEditEngine> engine_;
};
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index 3cf4ed36e0..0e9005d88e 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -33,7 +33,7 @@ bool IsTextAlignmentTop(const FDE_TextAlignment align) {
// static
bool CFDE_TextOut::DrawString(CFX_RenderDevice* device,
FX_ARGB color,
- const CFX_RetainPtr<CFGAS_GEFont>& pFont,
+ const RetainPtr<CFGAS_GEFont>& pFont,
FXTEXT_CHARPOS* pCharPos,
int32_t iCount,
float fFontSize,
@@ -63,11 +63,11 @@ bool CFDE_TextOut::DrawString(CFX_RenderDevice* device,
FxFont.SetSubstFont(std::move(SubstFxFont));
#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
- CFX_RetainPtr<CFGAS_GEFont> pCurFont;
+ RetainPtr<CFGAS_GEFont> pCurFont;
FXTEXT_CHARPOS* pCurCP = nullptr;
int32_t iCurCount = 0;
for (int32_t i = 0; i < iCount; ++i) {
- CFX_RetainPtr<CFGAS_GEFont> pSTFont =
+ RetainPtr<CFGAS_GEFont> pSTFont =
pFont->GetSubstFont(static_cast<int32_t>(pCharPos->m_GlyphIndex));
pCharPos->m_GlyphIndex &= 0x00FFFFFF;
pCharPos->m_bFontStyle = false;
@@ -140,7 +140,7 @@ CFDE_TextOut::CFDE_TextOut()
CFDE_TextOut::~CFDE_TextOut() {}
-void CFDE_TextOut::SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont) {
+void CFDE_TextOut::SetFont(const RetainPtr<CFGAS_GEFont>& pFont) {
ASSERT(pFont);
m_pFont = pFont;
m_pTxtBreak->SetFont(pFont);
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h
index b936eb4415..f69c0a8717 100644
--- a/xfa/fde/cfde_textout.h
+++ b/xfa/fde/cfde_textout.h
@@ -77,7 +77,7 @@ class CFDE_TextOut {
public:
static bool DrawString(CFX_RenderDevice* device,
FX_ARGB color,
- const CFX_RetainPtr<CFGAS_GEFont>& pFont,
+ const RetainPtr<CFGAS_GEFont>& pFont,
FXTEXT_CHARPOS* pCharPos,
int32_t iCount,
float fFontSize,
@@ -86,7 +86,7 @@ class CFDE_TextOut {
CFDE_TextOut();
~CFDE_TextOut();
- void SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont);
+ void SetFont(const RetainPtr<CFGAS_GEFont>& pFont);
void SetFontSize(float fFontSize);
void SetTextColor(FX_ARGB color) { m_TxtColor = color; }
void SetStyles(const FDE_TextStyle& dwStyles);
@@ -121,7 +121,7 @@ class CFDE_TextOut {
int32_t GetDisplayPos(FDE_TTOPIECE* pPiece);
std::unique_ptr<CFX_TxtBreak> m_pTxtBreak;
- CFX_RetainPtr<CFGAS_GEFont> m_pFont;
+ RetainPtr<CFGAS_GEFont> m_pFont;
float m_fFontSize;
float m_fLineSpace;
float m_fLinePos;