Changed EUnicodeBidi to an enum class and renamed its members

third_party/WebKit/Source/core/layout/ng/ng_layout_inline_items_builder.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/ng_layout_inline_items_builder.h"
 
 #include "core/layout/LayoutObject.h"
 #include "core/layout/ng/ng_inline_node.h"
 #include "core/style/ComputedStyle.h"
 
@@ skipping 189 matching lines @@
   AppendAsOpaqueToSpaceCollapsing(
       style->direction() == TextDirection::kRtl ? rtl : ltr);
 }
 
 void NGLayoutInlineItemsBuilder::EnterBlock(const ComputedStyle* style) {
   // Handle bidi-override on the block itself.
   // Isolate and embed values are enforced by default and redundant on the block
   // 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);
   }
 }
 
 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);
       Enter(node, popDirectionalIsolateCharacter);
       Enter(node, popDirectionalFormattingCharacter);
       break;
   }
 }
 
 void NGLayoutInlineItemsBuilder::Enter(LayoutObject* node,
@@ skipping 12 matching lines @@
 }
 
 void NGLayoutInlineItemsBuilder::Exit(LayoutObject* node) {
   while (!exits_.isEmpty() && exits_.back().node == node) {
     AppendAsOpaqueToSpaceCollapsing(exits_.back().character);
     exits_.pop_back();
   }
 }
 
 }  // namespace blink