Merge to XFA: Cleanup: s/Torelance/Tolerance/

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1294713002 .

(cherry picked from commit 45c910f02063cab51d0d90137d451a666c33b85f)

Review URL: https://codereview.chromium.org/1285183005 .

5 files changed, 23 insertions, 23 deletions

diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index eb16ca9a90..f27f1db7e6 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -102,13 +102,13 @@ class IPDF_TextPage {
                             CFX_RectArray& rectArray) const = 0;
 
   virtual int GetIndexAtPos(CPDF_Point point,
-                            FX_FLOAT xTorelance,
-                            FX_FLOAT yTorelance) const = 0;
+                            FX_FLOAT xTolerance,
+                            FX_FLOAT yTolerance) const = 0;
 
   virtual int GetIndexAtPos(FX_FLOAT x,
                             FX_FLOAT y,
-                            FX_FLOAT xTorelance,
-                            FX_FLOAT yTorelance) const = 0;
+                            FX_FLOAT xTolerance,
+                            FX_FLOAT yTolerance) const = 0;
 
   virtual CFX_WideString GetTextByRect(const CFX_FloatRect& rect) const = 0;
 
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index 9d4555c27e..55e997c177 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -353,8 +353,8 @@ void CPDF_TextPage::GetRectArray(int start,
   return;
 }
 int CPDF_TextPage::GetIndexAtPos(CPDF_Point point,
-                                 FX_FLOAT xTorelance,
-                                 FX_FLOAT yTorelance) const {
+                                 FX_FLOAT xTolerance,
+                                 FX_FLOAT yTolerance) const {
   if (m_ParseOptions.m_bGetCharCodeOnly) {
     return -3;
   }
@@ -370,13 +370,13 @@ int CPDF_TextPage::GetIndexAtPos(CPDF_Point point,
     if (charrect.Contains(point.x, point.y)) {
       break;
     }
-    if (xTorelance > 0 || yTorelance > 0) {
+    if (xTolerance > 0 || yTolerance > 0) {
       CFX_FloatRect charRectExt;
       charrect.Normalize();
-      charRectExt.left = charrect.left - xTorelance / 2;
-      charRectExt.right = charrect.right + xTorelance / 2;
-      charRectExt.top = charrect.top + yTorelance / 2;
-      charRectExt.bottom = charrect.bottom - yTorelance / 2;
+      charRectExt.left = charrect.left - xTolerance / 2;
+      charRectExt.right = charrect.right + xTolerance / 2;
+      charRectExt.top = charrect.top + yTolerance / 2;
+      charRectExt.bottom = charrect.bottom - yTolerance / 2;
       if (charRectExt.Contains(point.x, point.y)) {
         double curXdif, curYdif;
         curXdif = FXSYS_fabs(point.x - charrect.left) <
@@ -492,13 +492,13 @@ void CPDF_TextPage::GetRectsArrayByRect(const CFX_FloatRect& rect,
 }
 int CPDF_TextPage::GetIndexAtPos(FX_FLOAT x,
                                  FX_FLOAT y,
-                                 FX_FLOAT xTorelance,
-                                 FX_FLOAT yTorelance) const {
+                                 FX_FLOAT xTolerance,
+                                 FX_FLOAT yTolerance) const {
   if (m_ParseOptions.m_bGetCharCodeOnly) {
     return -3;
   }
   CPDF_Point point(x, y);
-  return GetIndexAtPos(point, xTorelance, yTorelance);
+  return GetIndexAtPos(point, xTolerance, yTolerance);
 }
 void CPDF_TextPage::GetCharInfo(int index, FPDF_CHAR_INFO& info) const {
   if (m_ParseOptions.m_bGetCharCodeOnly) {
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 50b9ab2c42..ec25c2b78a 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -61,12 +61,12 @@ class CPDF_TextPage : public IPDF_TextPage {
                             int nCount,
                             CFX_RectArray& rectArray) const;
   virtual int GetIndexAtPos(CPDF_Point point,
-                            FX_FLOAT xTorelance,
-                            FX_FLOAT yTorelance) const;
+                            FX_FLOAT xTolerance,
+                            FX_FLOAT yTolerance) const;
   virtual int GetIndexAtPos(FX_FLOAT x,
                             FX_FLOAT y,
-                            FX_FLOAT xTorelance,
-                            FX_FLOAT yTorelance) const;
+                            FX_FLOAT xTolerance,
+                            FX_FLOAT yTolerance) const;
   virtual CFX_WideString GetTextByRect(const CFX_FloatRect& rect) const;
   virtual void GetRectsArrayByRect(const CFX_FloatRect& rect,
                                    CFX_RectArray& resRectArray) const;
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp
index fad2b8479f..e6bb9f0709 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/src/fpdftext.cpp
@@ -92,13 +92,13 @@ DLLEXPORT void STDCALL FPDFText_GetCharBox(FPDF_TEXTPAGE text_page,
 DLLEXPORT int STDCALL FPDFText_GetCharIndexAtPos(FPDF_TEXTPAGE text_page,
                                                  double x,
                                                  double y,
-                                                 double xTorelance,
-                                                 double yTorelance) {
+                                                 double xTolerance,
+                                                 double yTolerance) {
   if (!text_page)
     return -3;
   IPDF_TextPage* textpage = (IPDF_TextPage*)text_page;
-  return textpage->GetIndexAtPos((FX_FLOAT)x, (FX_FLOAT)y, (FX_FLOAT)xTorelance,
-                                 (FX_FLOAT)yTorelance);
+  return textpage->GetIndexAtPos((FX_FLOAT)x, (FX_FLOAT)y, (FX_FLOAT)xTolerance,
+                                 (FX_FLOAT)yTolerance);
 }
 
 DLLEXPORT int STDCALL FPDFText_GetText(FPDF_TEXTPAGE text_page,
diff --git a/public/fpdf_text.h b/public/fpdf_text.h
index 3046bb0f85..df953671b2 100644
--- a/public/fpdf_text.h
+++ b/public/fpdf_text.h
@@ -136,7 +136,7 @@ DLLEXPORT void STDCALL FPDFText_GetCharBox(FPDF_TEXTPAGE text_page,
 DLLEXPORT int STDCALL FPDFText_GetCharIndexAtPos(FPDF_TEXTPAGE text_page,
                                                  double x,
                                                  double y,
-                                                 double xTorelance,
+                                                 double xTolerance,
                                                  double yTolerance);
 
 // Function: FPDFText_GetText