diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-06 13:52:35 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-06 18:03:58 +0000 |
| commit | 8f6084b710362e950ae752ac0f5aa6ba954fdbfd (patch) | |
| tree | af848affaf1d8ba3098dcae82f41934e31a09227 /xfa/fde/cfde_texteditengine.h | |
| parent | eb57e0d0b396606b39ef76a864b8bf9dd91a8ed8 (diff) | |
| download | pdfium-8f6084b710362e950ae752ac0f5aa6ba954fdbfd.tar.xz | |
Merge CFX_WordBreak into CFDE_TextEditEngine::Iterator.
This CL moves the CFX_WordBreak::FindNextBreakPos into the text edit
engine iterator. The word break data was moved to cfde_wordbreak_data.
Change-Id: Ie022f5f761479f97b9d4bc7789f890cb2ef99106
Reviewed-on: https://pdfium-review.googlesource.com/13250
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_texteditengine.h')
| -rw-r--r-- | xfa/fde/cfde_texteditengine.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h index 0277b0cc64..63b3b53d93 100644 --- a/xfa/fde/cfde_texteditengine.h +++ b/xfa/fde/cfde_texteditengine.h @@ -13,7 +13,6 @@ #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" -#include "core/fxcrt/ifx_chariter.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" #include "xfa/fgas/font/cfgas_gefont.h" @@ -38,17 +37,17 @@ inline FDE_TEXTEDITPIECE::~FDE_TEXTEDITPIECE() = default; class CFDE_TextEditEngine { public: - class Iterator : public IFX_CharIter { + class Iterator { public: explicit Iterator(const CFDE_TextEditEngine* engine); - ~Iterator() override; - - bool Next(bool bPrev = false) override; - wchar_t GetChar() const override; - void SetAt(int32_t nIndex) override; - int32_t GetAt() const override; - bool IsEOF(bool bTail = true) const override; - std::unique_ptr<IFX_CharIter> Clone() const override; + ~Iterator(); + + void Next(bool bPrev); + wchar_t GetChar() const; + void SetAt(int32_t nIndex); + int32_t GetAt() const; + void FindNextBreakPos(bool bPrev); + bool IsEOF(bool bTail) const; private: CFX_UnownedPtr<const CFDE_TextEditEngine> engine_; |