diff options
Diffstat (limited to 'core/fxcrt/fx_bidi.cpp')
| -rw-r--r-- | core/fxcrt/fx_bidi.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp index db46d994c9..48504e5821 100644 --- a/core/fxcrt/fx_bidi.cpp +++ b/core/fxcrt/fx_bidi.cpp @@ -577,16 +577,14 @@ void CFX_BidiChar::StartNewSegment(CFX_BidiChar::Direction direction) { m_CurrentSegment.direction = direction; } -CFX_BidiString::CFX_BidiString(const WideString& str) - : m_Str(str), - m_pBidiChar(pdfium::MakeUnique<CFX_BidiChar>()), - m_eOverallDirection(CFX_BidiChar::LEFT) { - for (const auto& c : m_Str) { - if (m_pBidiChar->AppendChar(c)) - m_Order.push_back(m_pBidiChar->GetSegmentInfo()); +CFX_BidiString::CFX_BidiString(const WideString& str) : m_Str(str) { + CFX_BidiChar bidi; + for (wchar_t c : m_Str) { + if (bidi.AppendChar(c)) + m_Order.push_back(bidi.GetSegmentInfo()); } - if (m_pBidiChar->EndChar()) - m_Order.push_back(m_pBidiChar->GetSegmentInfo()); + if (bidi.EndChar()) + m_Order.push_back(bidi.GetSegmentInfo()); size_t nR2L = std::count_if(m_Order.begin(), m_Order.end(), [](const CFX_BidiChar::Segment& seg) { @@ -604,6 +602,11 @@ CFX_BidiString::CFX_BidiString(const WideString& str) CFX_BidiString::~CFX_BidiString() {} +CFX_BidiChar::Direction CFX_BidiString::OverallDirection() const { + ASSERT(m_eOverallDirection != CFX_BidiChar::NEUTRAL); + return m_eOverallDirection; +} + void CFX_BidiString::SetOverallDirectionRight() { if (m_eOverallDirection != CFX_BidiChar::RIGHT) { std::reverse(m_Order.begin(), m_Order.end()); |