| Index: third_party/WebKit/Source/core/layout/line/InlineIterator.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/InlineIterator.h b/third_party/WebKit/Source/core/layout/line/InlineIterator.h
|
| index 91bf6d1c6160400f3ff9bd11d1f12a81572aa7c3..cf2798d84cb0da08de9ba21b0862bf8fa3d5fac8 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/InlineIterator.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/InlineIterator.h
|
| @@ -144,9 +144,9 @@ inline bool operator!=(const InlineIterator& it1, const InlineIterator& it2) {
|
|
|
| static inline WTF::Unicode::CharDirection embedCharFromDirection(
|
| TextDirection dir,
|
| - EUnicodeBidi unicodeBidi) {
|
| + UnicodeBidi unicodeBidi) {
|
| using namespace WTF::Unicode;
|
| - if (unicodeBidi == EUnicodeBidi::kEmbed) {
|
| + if (unicodeBidi == UnicodeBidi::kEmbed) {
|
| return dir == TextDirection::kRtl ? RightToLeftEmbedding
|
| : LeftToRightEmbedding;
|
| }
|
| @@ -154,7 +154,7 @@ static inline WTF::Unicode::CharDirection embedCharFromDirection(
|
| }
|
|
|
| static inline bool treatAsIsolated(const ComputedStyle& style) {
|
| - return isIsolated(style.unicodeBidi()) &&
|
| + return isIsolated(style.getUnicodeBidi()) &&
|
| style.rtlOrdering() == EOrder::kLogical;
|
| }
|
|
|
| @@ -165,8 +165,8 @@ static inline void notifyObserverEnteredObject(Observer* observer,
|
| return;
|
|
|
| const ComputedStyle& style = object.styleRef();
|
| - EUnicodeBidi unicodeBidi = style.unicodeBidi();
|
| - if (unicodeBidi == EUnicodeBidi::kNormal) {
|
| + UnicodeBidi unicodeBidi = style.getUnicodeBidi();
|
| + if (unicodeBidi == UnicodeBidi::kNormal) {
|
| // http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi
|
| // "The element does not open an additional level of embedding with respect
|
| // to the bidirectional algorithm."
|
| @@ -194,8 +194,8 @@ static inline void notifyObserverWillExitObject(Observer* observer,
|
| if (!observer || !object || !object.isLayoutInline())
|
| return;
|
|
|
| - EUnicodeBidi unicodeBidi = object.style()->unicodeBidi();
|
| - if (unicodeBidi == EUnicodeBidi::kNormal)
|
| + UnicodeBidi unicodeBidi = object.style()->getUnicodeBidi();
|
| + if (unicodeBidi == UnicodeBidi::kNormal)
|
| return; // Nothing to do for unicode-bidi: normal
|
| if (treatAsIsolated(object.styleRef())) {
|
| observer->exitIsolate();
|
|
|