Reduce diffs with master in core

core/src/fxge/ge/fx_ge_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/fxge/fx_ge.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "text_int.h"
 
 #undef FX_GAMMA
 #undef FX_GAMMA_INVERSE
 #define FX_GAMMA(value) (value)
 #define FX_GAMMA_INVERSE(value) (value)
 
+namespace {
+
+void ResetTransform(FT_Face face) {
+  FXFT_Matrix matrix;
+  matrix.xx = 0x10000L;
+  matrix.xy = 0;
+  matrix.yx = 0;
+  matrix.yy = 0x10000L;
+  FXFT_Set_Transform(face, &matrix, 0);
+}
+
+// Sets the given transform on the font, and resets it to the identity when it
+// goes out of scope.
+class ScopedFontTransform {
+ public:
+  ScopedFontTransform(FT_Face face, FXFT_Matrix* matrix) : m_Face(face) {
+    FXFT_Set_Transform(m_Face, matrix, 0);
+  }
+
+  ~ScopedFontTransform() { ResetTransform(m_Face); }
+
+ private:
+  FT_Face m_Face;
+};
+
+}  // namespace
+
 FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos,
                            int nChars,
                            int anti_alias,
                            FX_FLOAT retinaScaleX,
                            FX_FLOAT retinaScaleY) {
   FX_RECT rect(0, 0, 0, 0);
   FX_BOOL bStarted = FALSE;
   for (int iChar = 0; iChar < nChars; iChar++) {
     FXTEXT_GLYPHPOS& glyph = pGlyphAndPos[iChar];
     const CFX_GlyphBitmap* pGlyph = glyph.m_pGlyph;
@@ skipping 1122 matching lines @@
   const FX_BOOL bExternal = internal_face == nullptr;
   FXFT_Face face =
       bExternal ? (FXFT_Face)pFont->GetSubstFont()->m_ExtHandle : internal_face;
   CFX_FTCacheMap& map = bExternal ? m_ExtFaceMap : m_FTFaceMap;
   auto it = map.find(face);
   if (it != map.end()) {
     CFX_CountedFaceCache* counted_face_cache = it->second;
     counted_face_cache->m_nCount++;
     return counted_face_cache->m_Obj;
   }
+
   CFX_FaceCache* face_cache = new CFX_FaceCache(bExternal ? nullptr : face);
   CFX_CountedFaceCache* counted_face_cache = new CFX_CountedFaceCache;
   counted_face_cache->m_nCount = 2;
   counted_face_cache->m_Obj = face_cache;
   map[face] = counted_face_cache;
   return face_cache;
 }
 
 void CFX_FontCache::ReleaseCachedFace(CFX_Font* pFont) {
   FXFT_Face internal_face = pFont->GetFace();
@@ skipping 348 matching lines @@
         ft_matrix.yx += ft_matrix.yy * skew / 100;
       } else {
         ft_matrix.xy += -ft_matrix.xx * skew / 100;
       }
     }
     if (pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) {
       pFont->AdjustMMParams(glyph_index, dest_width,
                             pFont->GetSubstFont()->m_Weight);
     }
   }
-  FXFT_Set_Transform(m_Face, &ft_matrix, 0);
+  ScopedFontTransform scoped_transform(m_Face, &ft_matrix);
   int load_flags = (m_Face->face_flags & FT_FACE_FLAG_SFNT)
                        ? FXFT_LOAD_NO_BITMAP
                        : (FXFT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING);
   int error = FXFT_Load_Glyph(m_Face, glyph_index, load_flags);
   if (error) {
     // if an error is returned, try to reload glyphs without hinting.
     if (load_flags & FT_LOAD_NO_HINTING || load_flags & FT_LOAD_NO_SCALE) {
       return NULL;
     }
 
@@ skipping 246 matching lines @@
       if (m_bVertical) {
         ft_matrix.yx += ft_matrix.yy * skew / 100;
       } else {
         ft_matrix.xy += -ft_matrix.xx * skew / 100;
       }
     }
     if (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) {
       AdjustMMParams(glyph_index, dest_width, m_pSubstFont->m_Weight);
     }
   }
-  FXFT_Set_Transform(m_Face, &ft_matrix, 0);
+  ScopedFontTransform scoped_transform(m_Face, &ft_matrix);
   int load_flags = FXFT_LOAD_NO_BITMAP;
   if (!(m_Face->face_flags & FT_FACE_FLAG_SFNT) || !FT_IS_TRICKY(m_Face)) {
     load_flags |= FT_LOAD_NO_HINTING;
   }
   int error = FXFT_Load_Glyph(m_Face, glyph_index, load_flags);
   if (error) {
     return NULL;
   }
   if (m_pSubstFont && !(m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) &&
       m_pSubstFont->m_Weight > 400) {
@@ skipping 40 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((FX_DWORD*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(FX_DWORD);
 }