summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/cfx_cliprgn.cpp14
-rw-r--r--core/fxge/cfx_cliprgn.h1
-rw-r--r--core/fxge/cfx_fontmgr.cpp8
-rw-r--r--core/fxge/cfx_fontmgr.h1
4 files changed, 2 insertions, 22 deletions
diff --git a/core/fxge/cfx_cliprgn.cpp b/core/fxge/cfx_cliprgn.cpp
index 9569ee909c..8a3f946026 100644
--- a/core/fxge/cfx_cliprgn.cpp
+++ b/core/fxge/cfx_cliprgn.cpp
@@ -14,19 +14,9 @@
CFX_ClipRgn::CFX_ClipRgn(int width, int height)
: m_Type(RectI), m_Box(0, 0, width, height) {}
-CFX_ClipRgn::CFX_ClipRgn(const CFX_ClipRgn& src) {
- m_Type = src.m_Type;
- m_Box = src.m_Box;
- m_Mask = src.m_Mask;
-}
-
-CFX_ClipRgn::~CFX_ClipRgn() {}
+CFX_ClipRgn::CFX_ClipRgn(const CFX_ClipRgn& src) = default;
-void CFX_ClipRgn::Reset(const FX_RECT& rect) {
- m_Type = RectI;
- m_Box = rect;
- m_Mask = nullptr;
-}
+CFX_ClipRgn::~CFX_ClipRgn() = default;
void CFX_ClipRgn::IntersectRect(const FX_RECT& rect) {
if (m_Type == RectI) {
diff --git a/core/fxge/cfx_cliprgn.h b/core/fxge/cfx_cliprgn.h
index 58ebb4de73..0087739ad2 100644
--- a/core/fxge/cfx_cliprgn.h
+++ b/core/fxge/cfx_cliprgn.h
@@ -24,7 +24,6 @@ class CFX_ClipRgn {
const FX_RECT& GetBox() const { return m_Box; }
RetainPtr<CFX_DIBitmap> GetMask() const { return m_Mask; }
- void Reset(const FX_RECT& rect);
void IntersectRect(const FX_RECT& rect);
void IntersectMaskF(int left, int top, const RetainPtr<CFX_DIBitmap>& Mask);
diff --git a/core/fxge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp
index 0a19156b46..e781a70507 100644
--- a/core/fxge/cfx_fontmgr.cpp
+++ b/core/fxge/cfx_fontmgr.cpp
@@ -201,14 +201,6 @@ FXFT_Face CFX_FontMgr::GetFixedFace(pdfium::span<const uint8_t> span,
return FXFT_Set_Pixel_Sizes(face, 64, 64) ? nullptr : face;
}
-FXFT_Face CFX_FontMgr::GetFileFace(const char* filename, int face_index) {
- InitFTLibrary();
- FXFT_Face face = nullptr;
- if (FXFT_New_Face(m_FTLibrary, filename, face_index, &face))
- return nullptr;
- return FXFT_Set_Pixel_Sizes(face, 64, 64) ? nullptr : face;
-}
-
void CFX_FontMgr::ReleaseFace(FXFT_Face face) {
if (!face)
return;
diff --git a/core/fxge/cfx_fontmgr.h b/core/fxge/cfx_fontmgr.h
index 5ac8305d9a..609d51b125 100644
--- a/core/fxge/cfx_fontmgr.h
+++ b/core/fxge/cfx_fontmgr.h
@@ -46,7 +46,6 @@ class CFX_FontMgr {
std::unique_ptr<uint8_t, FxFreeDeleter> pData,
uint32_t size,
int font_offset);
- FXFT_Face GetFileFace(const char* filename, int face_index);
FXFT_Face GetFixedFace(pdfium::span<const uint8_t> span, int face_index);
void ReleaseFace(FXFT_Face face);
void SetSystemFontInfo(std::unique_ptr<SystemFontInfoIface> pFontInfo);