Index: third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc |
index 3a9ee9b15b78f7b524a4b8876a7ac77c69263d80..fc7f3299fdfd710212339ecc1e0214a7ee1dff0e 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc |
@@ -207,8 +207,8 @@ void NGLayoutInlineItemsBuilder::EnterBlock(const ComputedStyle* style) { |
// elements. |
// Plaintext and direction are handled as the paragraph level by |
// NGBidiParagraph::SetParagraph(). |
- if (style->unicodeBidi() == Override || |
- style->unicodeBidi() == IsolateOverride) { |
+ if (style->unicodeBidi() == EUnicodeBidi::kBidiOverride || |
+ style->unicodeBidi() == EUnicodeBidi::kIsolateOverride) { |
AppendBidiControl(style, leftToRightOverrideCharacter, |
rightToLeftOverrideCharacter); |
Enter(nullptr, popDirectionalFormattingCharacter); |
@@ -219,28 +219,28 @@ void NGLayoutInlineItemsBuilder::EnterInline(LayoutObject* node) { |
// https://drafts.csswg.org/css-writing-modes-3/#bidi-control-codes-injection-table |
const ComputedStyle* style = node->style(); |
switch (style->unicodeBidi()) { |
- case UBNormal: |
+ case EUnicodeBidi::kNormal: |
break; |
- case Embed: |
+ case EUnicodeBidi::kEmbed: |
AppendBidiControl(style, leftToRightEmbedCharacter, |
rightToLeftEmbedCharacter); |
Enter(node, popDirectionalFormattingCharacter); |
break; |
- case Override: |
+ case EUnicodeBidi::kBidiOverride: |
AppendBidiControl(style, leftToRightOverrideCharacter, |
rightToLeftOverrideCharacter); |
Enter(node, popDirectionalFormattingCharacter); |
break; |
- case Isolate: |
+ case EUnicodeBidi::kIsolate: |
AppendBidiControl(style, leftToRightIsolateCharacter, |
rightToLeftIsolateCharacter); |
Enter(node, popDirectionalIsolateCharacter); |
break; |
- case Plaintext: |
+ case EUnicodeBidi::kPlaintext: |
AppendAsOpaqueToSpaceCollapsing(firstStrongIsolateCharacter); |
Enter(node, popDirectionalIsolateCharacter); |
break; |
- case IsolateOverride: |
+ case EUnicodeBidi::kIsolateOverride: |
AppendAsOpaqueToSpaceCollapsing(firstStrongIsolateCharacter); |
AppendBidiControl(style, leftToRightOverrideCharacter, |
rightToLeftOverrideCharacter); |