diff options
| author | weili <weili@chromium.org> | 2016-06-14 17:21:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-14 17:21:14 -0700 |
| commit | f4bb580add3824196dc49cd7de2f7d051019ede8 (patch) | |
| tree | 15c1db6fb7000330d48c105c66acf1d468ba56bd /core/fpdftext | |
| parent | ee2abec93f22bd10522181dc0362f24d389fc66b (diff) | |
| download | pdfium-f4bb580add3824196dc49cd7de2f7d051019ede8.tar.xz | |
Make code compile with clang_use_chrome_plugin (part II)
This change contains files in core directory which were not covered
in part I. This is part of the efforts to make PDFium code compilable
by Clang chromium style plugins.
The changes are mainly the following:
-- move inline constructor/destructor of complex class/struct out-of-line;
-- add constructor/destructor of complex class/struct if not
explicitly defined;
-- add explicit out-of-line copy constructor when needed;
-- move inline virtual functions out-of-line;
-- Properly mark virtual functions with 'override';
-- some minor cleanups;
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2060913003
Diffstat (limited to 'core/fpdftext')
| -rw-r--r-- | core/fpdftext/fpdf_text_int.cpp | 7 | ||||
| -rw-r--r-- | core/fpdftext/include/cpdf_textpage.h | 8 | ||||
| -rw-r--r-- | core/fpdftext/include/cpdf_textpagefind.h | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/core/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp index 5be47143fd..565f078600 100644 --- a/core/fpdftext/fpdf_text_int.cpp +++ b/core/fpdftext/fpdf_text_int.cpp @@ -150,13 +150,14 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, FPDFText_Direction flags) m_parserflag(flags), m_pPreTextObj(nullptr), m_bIsParsed(false), - m_TextlineDir(TextOrientation::Unknown), - m_CurlineRect(0, 0, 0, 0) { + m_TextlineDir(TextOrientation::Unknown) { m_TextBuf.EstimateSize(0, 10240); pPage->GetDisplayMatrix(m_DisplayMatrix, 0, 0, (int)pPage->GetPageWidth(), (int)pPage->GetPageHeight(), 0); } +CPDF_TextPage::~CPDF_TextPage() {} + bool CPDF_TextPage::IsControlChar(const PAGECHAR_INFO& charInfo) { switch (charInfo.m_Unicode) { case 0x2: @@ -1829,6 +1830,8 @@ CPDF_TextPageFind::CPDF_TextPageFind(const CPDF_TextPage* pTextPage) } } +CPDF_TextPageFind::~CPDF_TextPageFind() {} + int CPDF_TextPageFind::GetCharIndex(int index) const { return m_pTextPage->CharIndexFromTextIndex(index); } diff --git a/core/fpdftext/include/cpdf_textpage.h b/core/fpdftext/include/cpdf_textpage.h index 0c1efdf34a..d414cbc829 100644 --- a/core/fpdftext/include/cpdf_textpage.h +++ b/core/fpdftext/include/cpdf_textpage.h @@ -61,11 +61,8 @@ struct PDFTEXT_Obj { class CPDF_TextPage { public: - static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1, - const CFX_FloatRect& rect2); - CPDF_TextPage(const CPDF_Page* pPage, FPDFText_Direction flags); - ~CPDF_TextPage() {} + ~CPDF_TextPage(); // IPDF_TextPage: void ParseTextPage(); @@ -98,6 +95,9 @@ class CPDF_TextPage { FX_FLOAT bottom, FX_BOOL bContains = FALSE); + static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1, + const CFX_FloatRect& rect2); + private: enum class TextOrientation { Unknown, diff --git a/core/fpdftext/include/cpdf_textpagefind.h b/core/fpdftext/include/cpdf_textpagefind.h index d9937772d1..4950bd1113 100644 --- a/core/fpdftext/include/cpdf_textpagefind.h +++ b/core/fpdftext/include/cpdf_textpagefind.h @@ -18,7 +18,7 @@ class CPDF_TextPage; class CPDF_TextPageFind { public: explicit CPDF_TextPageFind(const CPDF_TextPage* pTextPage); - ~CPDF_TextPageFind() {} + ~CPDF_TextPageFind(); FX_BOOL FindFirst(const CFX_WideString& findwhat, int flags, @@ -38,10 +38,6 @@ class CPDF_TextPageFind { int iSubString, FX_WCHAR chSep); CFX_WideString MakeReverse(const CFX_WideString& str); - int ReverseFind(const CFX_WideString& csPageText, - const CFX_WideString& csWord, - int nStartPos, - int& WordLength); int GetCharIndex(int index) const; private: |