commit fcbf844b4191ed3bed870ffb98eb0c4f8c0ad935
author Lei Zhang <thestig@chromium.org> Mon Oct 05 19:35:25 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Oct 05 19:35:25 2020 +0000
tree 0b9ba884970c4c8f0cb856f8d1b51087bfaaede4
parent 6a4f80fc43107df4d36dd31d40771b84463c13db

Make variable naming consistent in CPDF_TextPage::GetRectArray().

There's at least 3 styles in the method(). Switch to Google style.

Change-Id: I4ae9d4cd08f60e349c08972e7a581ddf33c8cad0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74331
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdftext/cpdf_textpage.cpp

diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 863f084..98c02da1 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -356,45 +356,45 @@
 }
 
 std::vector<CFX_FloatRect> CPDF_TextPage::GetRectArray(int start,
-                                                       int nCount) const {
+                                                       int count) const {
   std::vector<CFX_FloatRect> rects;
-  if (start < 0 || nCount == 0)
+  if (start < 0 || count == 0)
     return rects;
 
-  const int nCharListSize = CountChars();
-  if (start >= nCharListSize)
+  const int number_of_chars = CountChars();
+  if (start >= number_of_chars)
     return rects;
 
-  if (nCount < 0 || start + nCount > nCharListSize)
-    nCount = nCharListSize - start;
-  ASSERT(nCount > 0);
+  if (count < 0 || start + count > number_of_chars)
+    count = number_of_chars - start;
+  ASSERT(count > 0);
 
-  CPDF_TextObject* pCurObj = nullptr;
+  CPDF_TextObject* text_object = nullptr;
   CFX_FloatRect rect;
-  int curPos = start;
-  bool bFlagNewRect = true;
-  while (nCount--) {
-    const CharInfo& info_curchar = m_CharList[curPos++];
-    if (info_curchar.m_CharType == CPDF_TextPage::CharType::kGenerated)
+  int pos = start;
+  bool is_new_rect = true;
+  while (count--) {
+    const CharInfo& charinfo = m_CharList[pos++];
+    if (charinfo.m_CharType == CPDF_TextPage::CharType::kGenerated)
       continue;
-    if (info_curchar.m_CharBox.Width() < kSizeEpsilon ||
-        info_curchar.m_CharBox.Height() < kSizeEpsilon) {
+    if (charinfo.m_CharBox.Width() < kSizeEpsilon ||
+        charinfo.m_CharBox.Height() < kSizeEpsilon) {
       continue;
     }
-    if (!pCurObj)
-      pCurObj = info_curchar.m_pTextObj.Get();
-    if (pCurObj != info_curchar.m_pTextObj) {
+    if (!text_object)
+      text_object = charinfo.m_pTextObj.Get();
+    if (text_object != charinfo.m_pTextObj) {
       rects.push_back(rect);
-      pCurObj = info_curchar.m_pTextObj.Get();
-      bFlagNewRect = true;
+      text_object = charinfo.m_pTextObj.Get();
+      is_new_rect = true;
     }
-    if (bFlagNewRect) {
-      bFlagNewRect = false;
-      rect = info_curchar.m_CharBox;
+    if (is_new_rect) {
+      is_new_rect = false;
+      rect = charinfo.m_CharBox;
       rect.Normalize();
       continue;
     }
-    rect.Union(info_curchar.m_CharBox);
+    rect.Union(charinfo.m_CharBox);
   }
   rects.push_back(rect);
   return rects;

core/fpdftext/cpdf_textpage.h

diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index cb3c0c8..9be5604 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -63,7 +63,7 @@
   float GetCharFontSize(size_t index) const;
   CFX_FloatRect GetCharLooseBounds(size_t index) const;
 
-  std::vector<CFX_FloatRect> GetRectArray(int start, int nCount) const;
+  std::vector<CFX_FloatRect> GetRectArray(int start, int count) const;
   int GetIndexAtPos(const CFX_PointF& point, const CFX_SizeF& tolerance) const;
   WideString GetTextByRect(const CFX_FloatRect& rect) const;
   WideString GetTextByObject(const CPDF_TextObject* pTextObj) const;