Rename CPDF_Type3Glyphs to CPDF_Type3GlyphMap
Class names that are plural bug me no end.
Change-Id: I6b4d698946fcbfa03e4e6408dc1c20b4a50d6b57
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/57770
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn
index 2efbfad..dd9370d 100644
--- a/core/fpdfapi/render/BUILD.gn
+++ b/core/fpdfapi/render/BUILD.gn
@@ -42,8 +42,8 @@
"cpdf_transferfunc.h",
"cpdf_type3cache.cpp",
"cpdf_type3cache.h",
- "cpdf_type3glyphs.cpp",
- "cpdf_type3glyphs.h",
+ "cpdf_type3glyphmap.cpp",
+ "cpdf_type3glyphmap.h",
]
configs += [ "../../../:pdfium_core_config" ]
deps = [
diff --git a/core/fpdfapi/render/cpdf_type3cache.cpp b/core/fpdfapi/render/cpdf_type3cache.cpp
index ffcf91d..0a6ca83 100644
--- a/core/fpdfapi/render/cpdf_type3cache.cpp
+++ b/core/fpdfapi/render/cpdf_type3cache.cpp
@@ -12,7 +12,7 @@
#include "core/fpdfapi/font/cpdf_type3char.h"
#include "core/fpdfapi/font/cpdf_type3font.h"
-#include "core/fpdfapi/render/cpdf_type3glyphs.h"
+#include "core/fpdfapi/render/cpdf_type3glyphmap.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/cfx_glyphbitmap.h"
@@ -94,10 +94,10 @@
4, FXSYS_round(pMatrix->a * 10000), FXSYS_round(pMatrix->b * 10000),
FXSYS_round(pMatrix->c * 10000), FXSYS_round(pMatrix->d * 10000));
ByteString FaceGlyphsKey(keygen.m_Key, keygen.m_KeyLen);
- CPDF_Type3Glyphs* pSizeCache;
+ CPDF_Type3GlyphMap* pSizeCache;
auto it = m_SizeMap.find(FaceGlyphsKey);
if (it == m_SizeMap.end()) {
- auto pNew = pdfium::MakeUnique<CPDF_Type3Glyphs>();
+ auto pNew = pdfium::MakeUnique<CPDF_Type3GlyphMap>();
pSizeCache = pNew.get();
m_SizeMap[FaceGlyphsKey] = std::move(pNew);
} else {
@@ -115,7 +115,7 @@
}
std::unique_ptr<CFX_GlyphBitmap> CPDF_Type3Cache::RenderGlyph(
- CPDF_Type3Glyphs* pSize,
+ CPDF_Type3GlyphMap* pSize,
uint32_t charcode,
const CFX_Matrix* pMatrix) {
const CPDF_Type3Char* pChar = m_pFont->LoadChar(charcode);
diff --git a/core/fpdfapi/render/cpdf_type3cache.h b/core/fpdfapi/render/cpdf_type3cache.h
index 1a2b90a..d491784 100644
--- a/core/fpdfapi/render/cpdf_type3cache.h
+++ b/core/fpdfapi/render/cpdf_type3cache.h
@@ -17,7 +17,7 @@
class CFX_GlyphBitmap;
class CFX_Matrix;
class CPDF_Type3Font;
-class CPDF_Type3Glyphs;
+class CPDF_Type3GlyphMap;
class CPDF_Type3Cache final : public Retainable {
public:
@@ -30,12 +30,12 @@
explicit CPDF_Type3Cache(CPDF_Type3Font* pFont);
~CPDF_Type3Cache() override;
- std::unique_ptr<CFX_GlyphBitmap> RenderGlyph(CPDF_Type3Glyphs* pSize,
+ std::unique_ptr<CFX_GlyphBitmap> RenderGlyph(CPDF_Type3GlyphMap* pSize,
uint32_t charcode,
const CFX_Matrix* pMatrix);
UnownedPtr<CPDF_Type3Font> const m_pFont;
- std::map<ByteString, std::unique_ptr<CPDF_Type3Glyphs>> m_SizeMap;
+ std::map<ByteString, std::unique_ptr<CPDF_Type3GlyphMap>> m_SizeMap;
};
#endif // CORE_FPDFAPI_RENDER_CPDF_TYPE3CACHE_H_
diff --git a/core/fpdfapi/render/cpdf_type3glyphs.cpp b/core/fpdfapi/render/cpdf_type3glyphmap.cpp
similarity index 83%
rename from core/fpdfapi/render/cpdf_type3glyphs.cpp
rename to core/fpdfapi/render/cpdf_type3glyphmap.cpp
index 3f52e66..8f0e330 100644
--- a/core/fpdfapi/render/cpdf_type3glyphs.cpp
+++ b/core/fpdfapi/render/cpdf_type3glyphmap.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/render/cpdf_type3glyphs.h"
+#include "core/fpdfapi/render/cpdf_type3glyphmap.h"
#include <algorithm>
#include <map>
@@ -36,11 +36,11 @@
} // namespace
-CPDF_Type3Glyphs::CPDF_Type3Glyphs() {}
+CPDF_Type3GlyphMap::CPDF_Type3GlyphMap() {}
-CPDF_Type3Glyphs::~CPDF_Type3Glyphs() {}
+CPDF_Type3GlyphMap::~CPDF_Type3GlyphMap() {}
-std::pair<int, int> CPDF_Type3Glyphs::AdjustBlue(float top, float bottom) {
+std::pair<int, int> CPDF_Type3GlyphMap::AdjustBlue(float top, float bottom) {
return std::make_pair(AdjustBlueHelper(top, &m_TopBlue),
AdjustBlueHelper(bottom, &m_BottomBlue));
}
diff --git a/core/fpdfapi/render/cpdf_type3glyphs.h b/core/fpdfapi/render/cpdf_type3glyphmap.h
similarity index 73%
rename from core/fpdfapi/render/cpdf_type3glyphs.h
rename to core/fpdfapi/render/cpdf_type3glyphmap.h
index 09dd70a..e712f9a 100644
--- a/core/fpdfapi/render/cpdf_type3glyphs.h
+++ b/core/fpdfapi/render/cpdf_type3glyphmap.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHS_H_
-#define CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHS_H_
+#ifndef CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHMAP_H_
+#define CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHMAP_H_
#include <map>
#include <memory>
@@ -16,10 +16,10 @@
class CFX_GlyphBitmap;
-class CPDF_Type3Glyphs {
+class CPDF_Type3GlyphMap {
public:
- CPDF_Type3Glyphs();
- ~CPDF_Type3Glyphs();
+ CPDF_Type3GlyphMap();
+ ~CPDF_Type3GlyphMap();
// Returns a pair of integers (top_line, bottom_line).
std::pair<int, int> AdjustBlue(float top, float bottom);
@@ -31,4 +31,4 @@
std::vector<int> m_BottomBlue;
};
-#endif // CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHS_H_
+#endif // CORE_FPDFAPI_RENDER_CPDF_TYPE3GLYPHMAP_H_
