commit bc1290560d96e95edd226460fa5995ab4e5945b8
author Lei Zhang <thestig@chromium.org> Thu Apr 01 03:16:22 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Apr 01 03:16:22 2021 +0000
tree 4ecad4894719097c180971b86866d9e1fd6b64a6
parent e7cb57a02b72908ee3b50702c6a256f534c0796a

Fix some parameter names in cwin32_platform.cpp.

Fix a set of typos and a set with the wrong naming style.

Change-Id: Ib9d99ba8d531a71d05759b5f79196f14ec6af470
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/78931
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/win32/cwin32_platform.cpp

diff --git a/core/fxge/win32/cwin32_platform.cpp b/core/fxge/win32/cwin32_platform.cpp
index 8c5b182..765050d 100644
--- a/core/fxge/win32/cwin32_platform.cpp
+++ b/core/fxge/win32/cwin32_platform.cpp
@@ -98,9 +98,9 @@
 
   bool IsOpenTypeFromDiv(const LOGFONTA* plf);
   bool IsSupportFontFormDiv(const LOGFONTA* plf);
-  void AddInstalledFont(const LOGFONTA* plf, uint32_t FontType);
-  void GetGBPreference(ByteString& face, int weight, int picth_family);
-  void GetJapanesePreference(ByteString& face, int weight, int picth_family);
+  void AddInstalledFont(const LOGFONTA* plf, uint32_t font_type);
+  void GetGBPreference(ByteString& face, int weight, int pitch_family);
+  void GetJapanesePreference(ByteString& face, int weight, int pitch_family);
   ByteString FindFont(const ByteString& name);
 
   const HDC m_hDC;
@@ -112,10 +112,10 @@
 
 int CALLBACK FontEnumProc(const LOGFONTA* plf,
                           const TEXTMETRICA* lpntme,
-                          uint32_t FontType,
+                          uint32_t font_type,
                           LPARAM lParam) {
   CFX_Win32FontInfo* pFontInfo = reinterpret_cast<CFX_Win32FontInfo*>(lParam);
-  pFontInfo->AddInstalledFont(plf, FontType);
+  pFontInfo->AddInstalledFont(plf, font_type);
   return 1;
 }
 
@@ -170,7 +170,7 @@
 }
 
 void CFX_Win32FontInfo::AddInstalledFont(const LOGFONTA* plf,
-                                         uint32_t FontType) {
+                                         uint32_t font_type) {
   ByteString name(plf->lfFaceName);
   if (name.GetLength() > 0 && name[0] == '@')
     return;
@@ -179,8 +179,8 @@
     m_pMapper->AddInstalledFont(name, plf->lfCharSet);
     return;
   }
-  if (!(FontType & TRUETYPE_FONTTYPE)) {
-    if (!(FontType & DEVICE_FONTTYPE) || !IsSupportFontFormDiv(plf))
+  if (!(font_type & TRUETYPE_FONTTYPE)) {
+    if (!(font_type & DEVICE_FONTTYPE) || !IsSupportFontFormDiv(plf))
       return;
   }
 
@@ -242,7 +242,7 @@
 
 void CFX_Win32FontInfo::GetGBPreference(ByteString& face,
                                         int weight,
-                                        int picth_family) {
+                                        int pitch_family) {
   if (face.Contains("KaiTi") || face.Contains("\xbf\xac")) {
     if (m_KaiTi.IsEmpty()) {
       m_KaiTi = FindFont("KaiTi");
@@ -263,7 +263,7 @@
     face = "SimSun";
   } else if (face.Contains("SimHei") || face.Contains("\xba\xda")) {
     face = "SimHei";
-  } else if (!(picth_family & FF_ROMAN) && weight > 550) {
+  } else if (!(pitch_family & FF_ROMAN) && weight > 550) {
     face = "SimHei";
   } else {
     face = "SimSun";
@@ -272,7 +272,7 @@
 
 void CFX_Win32FontInfo::GetJapanesePreference(ByteString& face,
                                               int weight,
-                                              int picth_family) {
+                                              int pitch_family) {
   if (face.Contains("Gothic") ||
       face.Contains("\x83\x53\x83\x56\x83\x62\x83\x4e")) {
     if (face.Contains("PGothic") ||
@@ -300,7 +300,7 @@
   if (GetSubFontName(&face))
     return;
 
-  if (!(picth_family & FF_ROMAN) && weight > 400) {
+  if (!(pitch_family & FF_ROMAN) && weight > 400) {
     face = "MS PGothic";
   } else {
     face = "MS PMincho";