From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- core/src/fxcrt/fx_arabic.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/src/fxcrt/fx_arabic.cpp') diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 497c1bab4f..3cb2fd067a 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(bool bSeparateNeutral) +void CFX_BidiChar::SetPolicy(FX_BOOL bSeparateNeutral) { m_bSeparateNeutral = bSeparateNeutral; } -bool CFX_BidiChar::AppendChar(FX_WCHAR wch) +FX_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 @@ bool CFX_BidiChar::AppendChar(FX_WCHAR wch) iContext = 2; break; } - bool bRet = false; + FX_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 @@ bool CFX_BidiChar::AppendChar(FX_WCHAR wch) m_iCurCount ++; return bRet; } -bool CFX_BidiChar::EndChar() +FX_BOOL CFX_BidiChar::EndChar() { m_iLastBidi = m_iCurBidi; m_iLastStart = m_iCurStart; -- cgit v1.2.3