OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008 Apple Inc. All right reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008 Apple Inc. All right reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 WTF::Unicode::CharDirection dir, | 427 WTF::Unicode::CharDirection dir, |
428 BidiEmbeddingSource source) { | 428 BidiEmbeddingSource source) { |
429 // Isolated spans compute base directionality during their own UBA run. | 429 // Isolated spans compute base directionality during their own UBA run. |
430 // Do not insert fake embed characters once we enter an isolated span. | 430 // Do not insert fake embed characters once we enter an isolated span. |
431 ASSERT(!inIsolate()); | 431 ASSERT(!inIsolate()); |
432 using namespace WTF::Unicode; | 432 using namespace WTF::Unicode; |
433 | 433 |
434 ASSERT(dir == PopDirectionalFormat || dir == LeftToRightEmbedding || | 434 ASSERT(dir == PopDirectionalFormat || dir == LeftToRightEmbedding || |
435 dir == LeftToRightOverride || dir == RightToLeftEmbedding || | 435 dir == LeftToRightOverride || dir == RightToLeftEmbedding || |
436 dir == RightToLeftOverride); | 436 dir == RightToLeftOverride); |
437 m_currentExplicitEmbeddingSequence.append(BidiEmbedding(dir, source)); | 437 m_currentExplicitEmbeddingSequence.push_back(BidiEmbedding(dir, source)); |
438 } | 438 } |
439 | 439 |
440 template <class Iterator, class Run, class IsolatedRun> | 440 template <class Iterator, class Run, class IsolatedRun> |
441 void BidiResolver<Iterator, Run, IsolatedRun>:: | 441 void BidiResolver<Iterator, Run, IsolatedRun>:: |
442 checkDirectionInLowerRaiseEmbeddingLevel() { | 442 checkDirectionInLowerRaiseEmbeddingLevel() { |
443 using namespace WTF::Unicode; | 443 using namespace WTF::Unicode; |
444 | 444 |
445 ASSERT(m_status.eor != OtherNeutral || m_eor.atEnd()); | 445 ASSERT(m_status.eor != OtherNeutral || m_eor.atEnd()); |
446 ASSERT(m_status.last != NonSpacingMark && m_status.last != BoundaryNeutral && | 446 ASSERT(m_status.last != NonSpacingMark && m_status.last != BoundaryNeutral && |
447 m_status.last != RightToLeftEmbedding && | 447 m_status.last != RightToLeftEmbedding && |
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1216 template <class Iterator, class Run, class IsolatedRun> | 1216 template <class Iterator, class Run, class IsolatedRun> |
1217 MidpointState<Iterator> | 1217 MidpointState<Iterator> |
1218 BidiResolver<Iterator, Run, IsolatedRun>::midpointStateForIsolatedRun( | 1218 BidiResolver<Iterator, Run, IsolatedRun>::midpointStateForIsolatedRun( |
1219 Run& run) { | 1219 Run& run) { |
1220 return m_midpointStateForIsolatedRun.take(&run); | 1220 return m_midpointStateForIsolatedRun.take(&run); |
1221 } | 1221 } |
1222 | 1222 |
1223 } // namespace blink | 1223 } // namespace blink |
1224 | 1224 |
1225 #endif // BidiResolver_h | 1225 #endif // BidiResolver_h |
OLD | NEW |