diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /core/src/fxcrt/fx_arabic.cpp | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/src/fxcrt/fx_arabic.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_arabic.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 3cb2fd067a..497c1bab4f 100644 --- a/core/src/fxcrt/fx_arabic.cpp +++ b/core/src/fxcrt/fx_arabic.cpp @@ -13,7 +13,7 @@ IFX_BidiChar* IFX_BidiChar::Create() return new CFX_BidiChar; } CFX_BidiChar::CFX_BidiChar() - : m_bSeparateNeutral(TRUE) + : m_bSeparateNeutral(true) , m_iCurStart(0) , m_iCurCount(0) , m_iCurBidi(0) @@ -22,12 +22,12 @@ CFX_BidiChar::CFX_BidiChar() , m_iLastCount(0) { } -void CFX_BidiChar::SetPolicy(FX_BOOL bSeparateNeutral) +void CFX_BidiChar::SetPolicy(bool bSeparateNeutral) { m_bSeparateNeutral = bSeparateNeutral; } -FX_BOOL CFX_BidiChar::AppendChar(FX_WCHAR wch) +bool CFX_BidiChar::AppendChar(FX_WCHAR wch) { FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS; @@ -43,10 +43,10 @@ FX_BOOL CFX_BidiChar::AppendChar(FX_WCHAR wch) iContext = 2; break; } - FX_BOOL bRet = FALSE; + bool bRet = false; if (iContext != m_iCurBidi) { if (m_bSeparateNeutral) { - bRet = TRUE; + bRet = true; } else { if (m_iCurBidi == 0) { bRet = (m_iCurCount > 0); @@ -67,7 +67,7 @@ FX_BOOL CFX_BidiChar::AppendChar(FX_WCHAR wch) m_iCurCount ++; return bRet; } -FX_BOOL CFX_BidiChar::EndChar() +bool CFX_BidiChar::EndChar() { m_iLastBidi = m_iCurBidi; m_iLastStart = m_iCurStart; |