Changed EUnicodeBidi to an enum class and renamed its members

third_party/WebKit/Source/core/layout/line/InlineIterator.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 128 matching lines @@
 
 inline bool operator!=(const InlineIterator& it1, const InlineIterator& it2) {
   return it1.offset() != it2.offset() ||
          it1.getLineLayoutItem() != it2.getLineLayoutItem();
 }
 
 static inline WTF::Unicode::CharDirection embedCharFromDirection(
     TextDirection dir,
     EUnicodeBidi unicodeBidi) {
   using namespace WTF::Unicode;
-  if (unicodeBidi == Embed) {
+  if (unicodeBidi == EUnicodeBidi::kEmbed) {
     return dir == TextDirection::kRtl ? RightToLeftEmbedding
                                       : LeftToRightEmbedding;
   }
   return dir == TextDirection::kRtl ? RightToLeftOverride : LeftToRightOverride;
 }
 
 static inline bool treatAsIsolated(const ComputedStyle& style) {
   return isIsolated(style.unicodeBidi()) &&
          style.rtlOrdering() == EOrder::Logical;
 }
 
 template <class Observer>
 static inline void notifyObserverEnteredObject(Observer* observer,
                                                LineLayoutItem object) {
   if (!observer || !object || !object.isLayoutInline())
     return;
 
   const ComputedStyle& style = object.styleRef();
   EUnicodeBidi unicodeBidi = style.unicodeBidi();
-  if (unicodeBidi == UBNormal) {
+  if (unicodeBidi == EUnicodeBidi::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."
     // Thus we ignore any possible dir= attribute on the span.
     return;
   }
   if (treatAsIsolated(style)) {
     // Make sure that explicit embeddings are committed before we enter the
     // isolated content.
     observer->commitExplicitEmbedding(observer->runs());
     observer->enterIsolate();
     // Embedding/Override characters implied by dir= will be handled when
     // we process the isolated span, not when laying out the "parent" run.
     return;
   }
 
   if (!observer->inIsolate())
     observer->embed(embedCharFromDirection(style.direction(), unicodeBidi),
                     FromStyleOrDOM);
 }
 
 template <class Observer>
 static inline void notifyObserverWillExitObject(Observer* observer,
                                                 LineLayoutItem object) {
   if (!observer || !object || !object.isLayoutInline())
     return;
 
   EUnicodeBidi unicodeBidi = object.style()->unicodeBidi();
-  if (unicodeBidi == UBNormal)
+  if (unicodeBidi == EUnicodeBidi::kNormal)
     return;  // Nothing to do for unicode-bidi: normal
   if (treatAsIsolated(object.styleRef())) {
     observer->exitIsolate();
     return;
   }
 
   // Otherwise we pop any embed/override character we added when we opened this
   // tag.
   if (!observer->inIsolate())
     observer->embed(WTF::Unicode::PopDirectionalFormat, FromStyleOrDOM);
@@ skipping 686 matching lines @@
     m_sor = m_eor;
   }
 
   m_direction = WTF::Unicode::OtherNeutral;
   m_status.eor = WTF::Unicode::OtherNeutral;
 }
 
 }  // namespace blink
 
 #endif  // InlineIterator_h