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, 2009, 2010 Apple Inc. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. |
4 * All right reserved. | 4 * All right reserved. |
5 * Copyright (C) 2010 Google Inc. All rights reserved. | 5 * Copyright (C) 2010 Google Inc. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 static inline WTF::Unicode::CharDirection embedCharFromDirection( | 145 static inline WTF::Unicode::CharDirection embedCharFromDirection( |
146 TextDirection dir, | 146 TextDirection dir, |
147 EUnicodeBidi unicodeBidi) { | 147 EUnicodeBidi unicodeBidi) { |
148 using namespace WTF::Unicode; | 148 using namespace WTF::Unicode; |
149 if (unicodeBidi == Embed) | 149 if (unicodeBidi == Embed) |
150 return dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding; | 150 return dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding; |
151 return dir == RTL ? RightToLeftOverride : LeftToRightOverride; | 151 return dir == RTL ? RightToLeftOverride : LeftToRightOverride; |
152 } | 152 } |
153 | 153 |
154 static inline bool treatAsIsolated(const ComputedStyle& style) { | 154 static inline bool treatAsIsolated(const ComputedStyle& style) { |
155 return isIsolated(style.unicodeBidi()) && style.rtlOrdering() == LogicalOrder; | 155 return isIsolated(style.unicodeBidi()) && |
| 156 style.rtlOrdering() == EOrder::Logical; |
156 } | 157 } |
157 | 158 |
158 template <class Observer> | 159 template <class Observer> |
159 static inline void notifyObserverEnteredObject(Observer* observer, | 160 static inline void notifyObserverEnteredObject(Observer* observer, |
160 LineLayoutItem object) { | 161 LineLayoutItem object) { |
161 if (!observer || !object || !object.isLayoutInline()) | 162 if (!observer || !object || !object.isLayoutInline()) |
162 return; | 163 return; |
163 | 164 |
164 const ComputedStyle& style = object.styleRef(); | 165 const ComputedStyle& style = object.styleRef(); |
165 EUnicodeBidi unicodeBidi = style.unicodeBidi(); | 166 EUnicodeBidi unicodeBidi = style.unicodeBidi(); |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
892 m_sor = m_eor; | 893 m_sor = m_eor; |
893 } | 894 } |
894 | 895 |
895 m_direction = WTF::Unicode::OtherNeutral; | 896 m_direction = WTF::Unicode::OtherNeutral; |
896 m_status.eor = WTF::Unicode::OtherNeutral; | 897 m_status.eor = WTF::Unicode::OtherNeutral; |
897 } | 898 } |
898 | 899 |
899 } // namespace blink | 900 } // namespace blink |
900 | 901 |
901 #endif // InlineIterator_h | 902 #endif // InlineIterator_h |
OLD | NEW |