Reduce diffs with master in core

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 "core/include/fpdftext/fpdf_text.h"
@@ skipping 177 matching lines @@
   CFX_WideStringArray m_csFindWhatArray;
   int m_findNextStart;
   int m_findPreStart;
   FX_BOOL m_bMatchCase;
   FX_BOOL m_bMatchWholeWord;
   int m_resStart;
   int m_resEnd;
   CFX_RectArray m_resArray;
   FX_BOOL m_IsFind;
 };
+
 class CPDF_LinkExt {
  public:
   CPDF_LinkExt() {}
   int m_Start;
   int m_Count;
   CFX_WideString m_strUrl;
   virtual ~CPDF_LinkExt() {}
 };
 
 typedef CFX_ArrayTemplate<CPDF_LinkExt*> LINK_InfoArray;
@@ skipping 28 matching lines @@
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 void NormalizeString(CFX_WideString& str);
 void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
 void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
                            CPDF_PageObjects* pPage,
                            FX_BOOL bUseLF,
                            CFX_PtrArray* pObjArray);
 
 #endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_