Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdftext/fpdf_text_search.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "text_int.h"
 
@@ skipping 95 matching lines @@
   pObj->GetItemInfo(0, &item);
   wstr = pObj->GetFont()->UnicodeFromCharCode(item.m_CharCode);
   if (wstr.GetLength()) {
     curChar = wstr.GetAt(0);
   }
   int nThisWidth = GetCharWidth(item.m_CharCode, pObj->GetFont());
   FX_FLOAT this_width = nThisWidth * pObj->GetFontSize() / 1000;
   this_width = FXSYS_fabs(this_width);
   FX_FLOAT threshold =
       last_width > this_width ? last_width / 4 : this_width / 4;
-  CFX_AffineMatrix prev_matrix, prev_reverse;
+  CFX_Matrix prev_matrix, prev_reverse;
   pPrevObj->GetTextMatrix(&prev_matrix);
   prev_reverse.SetReverse(prev_matrix);
   FX_FLOAT x = pObj->GetPosX(), y = pObj->GetPosY();
   prev_reverse.Transform(x, y);
   if (FXSYS_fabs(y) > threshold * 2) {
     return 2;
   }
   threshold = (FX_FLOAT)(nLastWidth > nThisWidth ? nLastWidth : nThisWidth);
   threshold = threshold > 400
                   ? (threshold < 700 ? threshold / 4 : threshold / 5)
@@ skipping 17 matching lines @@
       }
     }
   if (last_pos + last_width > x + this_width && curChar == L' ') {
     return 3;
   }
   return 0;
 }
 FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj,
                                        FX_BOOL bFirstLine) {
   CPDF_Font* pFont = pObj->GetFont();
-  CFX_AffineMatrix matrix;
+  CFX_Matrix matrix;
   pObj->GetTextMatrix(&matrix);
   int item_index = 0;
   if (m_pLastObj) {
     int result = FPDFText_ProcessInterObj(m_pLastObj, pObj);
     if (result == 2) {
       int len = m_Buffer.GetLength();
       if (len && m_bUseLF && m_Buffer.GetBuffer()[len - 1] == L'-') {
         m_Buffer.Delete(len - 1, 1);
         if (m_pObjArray) {
           m_pObjArray->RemoveAt((len - 1) * 2, 2);
@@ skipping 163 matching lines @@
     CPDF_PageObject* pObject = page.GetNextObject(pos);
     if (pObject->m_Type != PDFPAGE_TEXT) {
       continue;
     }
     if (textstream.ProcessObject((CPDF_TextObject*)pObject, TRUE)) {
       break;
     }
   }
   return buffer.GetWideString();
 }