diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-16 17:26:23 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-17 18:28:34 +0000 |
| commit | 9342b33ec0e2b43c0ee0b94bb70f2e981c263877 (patch) | |
| tree | 519e4585c8897224b4e778230876988790fbeb2a /xfa/fgas/layout | |
| parent | b5df8a5abc6ed986b7fb9c43103d188d32deb4e7 (diff) | |
| download | pdfium-9342b33ec0e2b43c0ee0b94bb70f2e981c263877.tar.xz | |
Remove redundant members in CFDE_TxtEdtEngine
This CL removes a bunch of redundant members from the text edit engine.
The change information tracking was removed as most of it was unused or
was used inconsistently.
Change-Id: I92460594e46accff0b78e1183c8574fc83ce728a
Reviewed-on: https://pdfium-review.googlesource.com/11275
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.cpp | 4 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index b2c54e5c6d..8d084fb41e 100644 --- a/xfa/fgas/layout/cfx_txtbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -922,7 +922,6 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun, bool bSingleLine = !!(pTxtRun->dwStyles & FX_LAYOUTSTYLE_SingleLine); bool bCombText = !!(pTxtRun->dwStyles & FX_LAYOUTSTYLE_CombText); wchar_t wch; - wchar_t wLineBreakChar = pTxtRun->wLineBreakChar; int32_t iCharSize; float fCharSize; float fStart = bRTLPiece ? rect.right() : rect.left; @@ -939,7 +938,7 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun, fCharSize = static_cast<float>(iCharSize) / 20000.0f; bool bRet = (!bSingleLine && IsCtrlCode(wch)); if (!(wch == L'\v' || wch == L'\f' || wch == 0x2028 || wch == 0x2029 || - (wLineBreakChar != 0xFEFF && wch == wLineBreakChar))) { + wch == L'\n')) { bRet = false; } if (bRet) { @@ -991,7 +990,6 @@ FX_TXTRUN::FX_TXTRUN() iVerticalScale(100), dwCharStyles(0), pRect(nullptr), - wLineBreakChar(L'\n'), bSkipSpace(true) {} FX_TXTRUN::~FX_TXTRUN() {} diff --git a/xfa/fgas/layout/cfx_txtbreak.h b/xfa/fgas/layout/cfx_txtbreak.h index d74ea350fe..95130c070d 100644 --- a/xfa/fgas/layout/cfx_txtbreak.h +++ b/xfa/fgas/layout/cfx_txtbreak.h @@ -51,7 +51,6 @@ struct FX_TXTRUN { int32_t iVerticalScale; uint32_t dwCharStyles; const CFX_RectF* pRect; - wchar_t wLineBreakChar; bool bSkipSpace; }; |