summaryrefslogtreecommitdiff
path: root/core/src/fxcrt/fx_bidi.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-12 10:29:21 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-12 10:29:21 -0800
commit5a5f1f1c905f2c352d2fbde143456124dd2c0fbf (patch)
tree60e59c107a9edbc314636c1ca05094bae4f32204 /core/src/fxcrt/fx_bidi.cpp
parent6b90e983a9e3e7aee0c637a7b0c3c51f0dfc1faf (diff)
downloadpdfium-5a5f1f1c905f2c352d2fbde143456124dd2c0fbf.tar.xz
Make fx_bidi sane.
Replace array of heterogenous ints with array of struct. Create a class for traversing a string. Flip array when R2L and process with forward iterator always. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1682983002 .
Diffstat (limited to 'core/src/fxcrt/fx_bidi.cpp')
-rw-r--r--core/src/fxcrt/fx_bidi.cpp83
1 files changed, 49 insertions, 34 deletions
diff --git a/core/src/fxcrt/fx_bidi.cpp b/core/src/fxcrt/fx_bidi.cpp
index d5d87a345b..a7a3ecb295 100644
--- a/core/src/fxcrt/fx_bidi.cpp
+++ b/core/src/fxcrt/fx_bidi.cpp
@@ -7,60 +7,75 @@
#include "core/include/fxcrt/fx_bidi.h"
#include "core/include/fxcrt/fx_ucd.h"
-CFX_BidiChar::CFX_BidiChar()
- : m_iCurStart(0),
- m_iCurCount(0),
- m_CurBidi(NEUTRAL),
- m_iLastStart(0),
- m_iLastCount(0),
- m_LastBidi(NEUTRAL) {
-}
+#include <algorithm>
-CFX_BidiChar::~CFX_BidiChar() {
-}
+CFX_BidiChar::CFX_BidiChar()
+ : m_CurrentSegment({0, 0, NEUTRAL}), m_LastSegment({0, 0, NEUTRAL}) {}
bool CFX_BidiChar::AppendChar(FX_WCHAR wch) {
FX_DWORD dwProps = FX_GetUnicodeProperties(wch);
int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS;
- Direction bidi = NEUTRAL;
+ Direction direction = NEUTRAL;
switch (iBidiCls) {
case FX_BIDICLASS_L:
case FX_BIDICLASS_AN:
case FX_BIDICLASS_EN:
- bidi = LEFT;
+ direction = LEFT;
break;
case FX_BIDICLASS_R:
case FX_BIDICLASS_AL:
- bidi = RIGHT;
+ direction = RIGHT;
break;
}
- bool bRet = (bidi != m_CurBidi);
- if (bRet) {
- SaveCurrentStateToLastState();
- m_CurBidi = bidi;
- }
- m_iCurCount++;
- return bRet;
+ bool bChangeDirection = (direction != m_CurrentSegment.direction);
+ if (bChangeDirection)
+ StartNewSegment(direction);
+
+ m_CurrentSegment.count++;
+ return bChangeDirection;
}
bool CFX_BidiChar::EndChar() {
- SaveCurrentStateToLastState();
- return m_iLastCount > 0;
+ StartNewSegment(NEUTRAL);
+ return m_LastSegment.count > 0;
}
-CFX_BidiChar::Direction CFX_BidiChar::GetBidiInfo(int32_t* iStart,
- int32_t* iCount) const {
- if (iStart)
- *iStart = m_iLastStart;
- if (iCount)
- *iCount = m_iLastCount;
- return m_LastBidi;
+void CFX_BidiChar::StartNewSegment(CFX_BidiChar::Direction direction) {
+ m_LastSegment = m_CurrentSegment;
+ m_CurrentSegment.start += m_CurrentSegment.count;
+ m_CurrentSegment.count = 0;
+ m_CurrentSegment.direction = direction;
}
-void CFX_BidiChar::SaveCurrentStateToLastState() {
- m_LastBidi = m_CurBidi;
- m_iLastStart = m_iCurStart;
- m_iCurStart = m_iCurCount;
- m_iLastCount = m_iCurCount - m_iLastStart;
+CFX_BidiString::CFX_BidiString(const CFX_WideString& str)
+ : m_Str(str),
+ m_pBidiChar(new CFX_BidiChar),
+ m_eOverallDirection(CFX_BidiChar::LEFT) {
+ for (int i = 0; i < m_Str.GetLength(); ++i) {
+ if (m_pBidiChar->AppendChar(m_Str.GetAt(i)))
+ m_Order.push_back(m_pBidiChar->GetSegmentInfo());
+ }
+ if (m_pBidiChar->EndChar())
+ m_Order.push_back(m_pBidiChar->GetSegmentInfo());
+
+ size_t nR2L = std::count_if(m_Order.begin(), m_Order.end(),
+ [](const CFX_BidiChar::Segment& seg) {
+ return seg.direction == CFX_BidiChar::RIGHT;
+ });
+
+ size_t nL2R = std::count_if(m_Order.begin(), m_Order.end(),
+ [](const CFX_BidiChar::Segment& seg) {
+ return seg.direction == CFX_BidiChar::LEFT;
+ });
+
+ if (nR2L > 0 && nR2L >= nL2R)
+ SetOverallDirectionRight();
+}
+
+void CFX_BidiString::SetOverallDirectionRight() {
+ if (m_eOverallDirection != CFX_BidiChar::RIGHT) {
+ std::reverse(m_Order.begin(), m_Order.end());
+ m_eOverallDirection = CFX_BidiChar::RIGHT;
+ }
}