summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-08-31 14:53:44 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-31 19:20:55 +0000
commit47a90b894ecca2d3547226169602d7f8729d564f (patch)
tree117cc6d17c8887e10dbf8ba315d7605d9191d2a0 /xfa/fgas/layout
parent235818f45eda6fd47114c076bfa818b2ef3ba894 (diff)
downloadpdfium-47a90b894ecca2d3547226169602d7f8729d564f.tar.xz
More BIDI code shufflingchromium/3206chromium/3205
Change-Id: I6df7e7d1283541ea2e6b9bcf3de172f6a886054a Reviewed-on: https://pdfium-review.googlesource.com/12731 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.cpp14
-rw-r--r--xfa/fgas/layout/cfx_txtbreak.cpp5
2 files changed, 11 insertions, 8 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index a097361d95..be5780fc7a 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -565,16 +565,18 @@ int32_t CFX_RTFBreak::GetBreakPos(std::vector<CFX_Char>& tca,
uint32_t nCur = nCodeProp & 0x003F;
bool bNeedBreak = false;
FX_LINEBREAKTYPE eType;
- if (nCur == FX_CBP_TB) {
+ if (nCur == kBreakPropertyTB) {
bNeedBreak = true;
- eType = nNext == FX_CBP_TB ? FX_LBT_PROHIBITED_BRK
- : gs_FX_LineBreak_PairTable[nCur][nNext];
+ eType = nNext == kBreakPropertyTB
+ ? FX_LBT_PROHIBITED_BRK
+ : gs_FX_LineBreak_PairTable[nCur][nNext];
} else {
- if (nCur == FX_CBP_SP)
+ if (nCur == kBreakPropertySpace)
bNeedBreak = true;
- eType = nNext == FX_CBP_SP ? FX_LBT_PROHIBITED_BRK
- : gs_FX_LineBreak_PairTable[nCur][nNext];
+ eType = nNext == kBreakPropertySpace
+ ? FX_LBT_PROHIBITED_BRK
+ : gs_FX_LineBreak_PairTable[nCur][nNext];
}
if (bAllChars)
pCur->m_nBreakType = eType;
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index 3ba7640904..2ea64d2bd5 100644
--- a/xfa/fgas/layout/cfx_txtbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -548,14 +548,15 @@ int32_t CFX_TxtBreak::GetBreakPos(std::vector<CFX_Char>& ca,
pCur = &ca[iLength];
nCodeProp = pCur->char_props();
nCur = nCodeProp & 0x003F;
- if (nNext == FX_CBP_SP)
+ if (nNext == kBreakPropertySpace)
eType = FX_LBT_PROHIBITED_BRK;
else
eType = gs_FX_LineBreak_PairTable[nCur][nNext];
if (bAllChars)
pCur->m_nBreakType = static_cast<uint8_t>(eType);
if (!bOnlyBrk) {
- if (m_bSingleLine || iEndPos <= m_iLineWidth || nCur == FX_CBP_SP) {
+ if (m_bSingleLine || iEndPos <= m_iLineWidth ||
+ nCur == kBreakPropertySpace) {
if (eType == FX_LBT_DIRECT_BRK && iBreak < 0) {
iBreak = iLength;
iBreakPos = iEndPos;