Make fx_bidi sane.

core/src/fpdftext/text_int.h

 // 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
 
 #ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
 #define CORE_SRC_FPDFTEXT_TEXT_INT_H_
 
 #include <deque>
@@ skipping 103 matching lines @@
   FX_BOOL IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos);
   FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1,
                            CPDF_TextObject* pTextObj2);
   int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const;
   void CloseTempLine();
   void OnPiece(CFX_BidiChar* pBidi, CFX_WideString& str);
   int32_t PreMarkedContent(PDFTEXT_Obj pObj);
   void ProcessMarkedContent(PDFTEXT_Obj pObj);
   void CheckMarkedContentObject(int32_t& start, int32_t& nCount) const;
   void FindPreviousTextObject(void);
-  void AddCharInfoByLRDirection(CFX_WideString& str, int i);
-  void AddCharInfoByRLDirection(CFX_WideString& str, int i);
+  void AddCharInfoByLRDirection(FX_WCHAR wChar, PAGECHAR_INFO info);

[Lei Zhang, 2016/02/12 00:46:43]

Can you pass |info| by const ref?

[Tom Sepez, 2016/02/12 17:54:33]

Actually, I update it as part of the computations in this code, so I'd have to
copy it anyways there.

+  void AddCharInfoByRLDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
   int32_t GetTextObjectWritingMode(const CPDF_TextObject* pTextObj);
   int32_t FindTextlineFlowDirection();
 
   void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend);
   FX_BOOL IsRightToLeft(const CPDF_TextObject* pTextObj,
                         const CPDF_Font* pFont,
                         int nItems) const;
 
   std::vector<FX_WORD> m_CharIndex;
   const CPDF_PageObjectList* const m_pPage;
@@ skipping 96 matching lines @@
  private:
   LINK_InfoArray m_LinkList;
   const CPDF_TextPage* m_pTextPage;
   CFX_WideString m_strPageText;
   bool m_bIsParsed;
 };
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 
 #endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_