Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fpdftext/fpdf_text.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 "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fpdftext/fpdf_text.h"
@@ skipping 51 matching lines @@
   FX_DWORD space_charcode = pFont->CharCodeFromUnicode(' ');
   FX_FLOAT spacew = 0;
   if (space_charcode != -1) {
     spacew = fontsize_h * pFont->GetCharWidthF(space_charcode) / 1000;
   }
   if (spacew == 0) {
     spacew = fontsize_h / 4;
   }
   if (pText->m_TextState.GetBaselineAngle() != 0) {
     int cc = 0;
-    CFX_AffineMatrix matrix;
+    CFX_Matrix matrix;
     pText->GetTextMatrix(&matrix);
     for (int i = 0; i < pText->m_nChars; i++) {
       FX_DWORD charcode = pText->m_nChars == 1
                               ? (FX_DWORD)(uintptr_t)pText->m_pCharCodes
                               : pText->m_pCharCodes[i];
       if (charcode == (FX_DWORD)-1) {
         continue;
       }
       FX_RECT char_box;
       pFont->GetCharBBox(charcode, char_box);
@@ skipping 617 matching lines @@
     }
     int index = degree / 90 % 3 - 1;
     if (index < 0) {
       continue;
     }
     rotated_count[index]++;
   }
   if (total_count == 0) {
     return;
   }
-  CFX_AffineMatrix matrix;
+  CFX_Matrix matrix;
   if (rotated_count[0] > total_count * 2 / 3) {
     matrix.Set(0, -1, 1, 0, 0, page.GetPageHeight());
   } else if (rotated_count[1] > total_count * 2 / 3) {
     matrix.Set(-1, 0, 0, -1, page.GetPageWidth(), page.GetPageHeight());
   } else if (rotated_count[2] > total_count * 2 / 3) {
     matrix.Set(0, 1, -1, 0, page.GetPageWidth(), 0);
   } else {
     return;
   }
   page.Transform(matrix);
@@ skipping 59 matching lines @@
                                FX_DWORD flags) {
   buffer.EstimateSize(0, 10240);
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }