Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

xfa/src/fxgraphics/src/fx_graphics.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 "pre.h"
 #include "fx_path_generator.h"
 class CAGG_Graphics {
  public:
@@ skipping 1080 matching lines @@
       delete bmp1;
       bmp1 = NULL;
     }
   }
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Graphics::CalcTextInfo(const CFX_WideString& text,
                                   FX_DWORD* charCodes,
                                   FXTEXT_CHARPOS* charPos,
                                   CFX_RectF& rect) {
-  IFX_FontEncoding* encoding = FXGE_CreateUnicodeEncoding(_info._font);
+  CFX_UnicodeEncoding* encoding = new CFX_UnicodeEncoding(_info._font);

[Tom Sepez, 2015/08/17 23:49:29]

same here.

[Lei Zhang, 2015/08/18 01:36:39]

Done.

   int32_t length = text.GetLength();
   FX_FLOAT penX = (FX_FLOAT)rect.left;
   FX_FLOAT penY = (FX_FLOAT)rect.top;
   FX_FLOAT left = (FX_FLOAT)(0);
   FX_FLOAT top = (FX_FLOAT)(0);
   charCodes[0] = text.GetAt(0);
   charPos[0].m_OriginX = penX + left;
   charPos[0].m_OriginY = penY + top;
   charPos[0].m_GlyphIndex = encoding->GlyphFromCharCode(charCodes[0]);
   charPos[0].m_FontCharWidth = FXSYS_round(
@@ skipping 17 matching lines @@
     charPos[i].m_AdjustMatrix[0] = -1;
     charPos[i].m_AdjustMatrix[1] = 0;
     charPos[i].m_AdjustMatrix[2] = 0;
     charPos[i].m_AdjustMatrix[3] = 1;
     penX += (FX_FLOAT)(charPos[i].m_FontCharWidth) * _info._fontSize / 1000 +
             _info._fontSpacing;
   }
   rect.width = (FX_FLOAT)penX - rect.left;
   rect.height = rect.top + _info._fontSize * _info._fontHScale - rect.top;
   delete encoding;
   encoding = NULL;

[Tom Sepez, 2015/08/17 23:49:29]

and here. Looks like there's some duplication for a followup.

[Lei Zhang, 2015/08/18 01:36:39]

Done.

   return FX_ERR_Succeeded;
 }
 CAGG_Graphics::CAGG_Graphics() {
   _owner = NULL;
 }
 FX_ERR CAGG_Graphics::Create(CFX_Graphics* owner,
                              int32_t width,
                              int32_t height,
                              FXDIB_Format format) {
   if (owner->_renderDevice) {
@@ skipping 300 matching lines @@
     b3 = (int32_t)(i * bScale);
     _argbArray[i] =
         FXARGB_TODIB(FXARGB_MAKE((a1 + a3), (r1 + r3), (g1 + g3), (b1 + b3)));
   }
   return FX_ERR_Succeeded;
 }
 class CFX_Pause : public IFX_Pause {
  public:
   virtual FX_BOOL NeedToPauseNow() { return TRUE; }
 };