[LayoutNG] Implement more text-align values and BiDi base direction

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.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/inline/ng_inline_node.h"
 
 #include "core/layout/BidiRun.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutText.h"
@@ skipping 174 matching lines @@
   ToLayoutNGBlockFlow(GetLayoutBlockFlow())->ResetNGInlineNodeData();
   MutableData().start_inline_ = start_inline;
   MutableData().text_content_ = String();
   MutableData().items_.clear();
 }
 
 void NGInlineNode::PrepareLayout() {
   // Scan list of siblings collecting all in-flow non-atomic inlines. A single
   // NGInlineNode represent a collection of adjacent non-atomic inlines.
   CollectInlines(Data().start_inline_, GetLayoutBlockFlow());
-  if (Data().is_bidi_enabled_)
-    SegmentText();
+  SegmentText();
   ShapeText();
 }
 
 // Depth-first-scan of all LayoutInline and LayoutText nodes that make up this
 // NGInlineNode object. Collects LayoutText items, merging them up into the
 // parent LayoutInline where possible, and joining all text content in a single
 // string to allow bidi resolution and shaping of the entire block.
 void NGInlineNode::CollectInlines(LayoutObject* start, LayoutBlockFlow* block) {
   DCHECK(Data().text_content_.IsNull());
   DCHECK(Data().items_.IsEmpty());
@@ skipping 68 matching lines @@
         return nullptr;
       DCHECK(node->IsInline());
       builder->ExitInline(node);
       node->ClearNeedsLayout();
     }
   }
   return nullptr;
 }
 
 void NGInlineNode::SegmentText() {
-  // TODO(kojii): Move this to caller, this will be used again after line break.
-  NGBidiParagraph bidi;
-  MutableData().text_content_.Ensure16Bit();
-  if (!bidi.SetParagraph(Data().text_content_, Style())) {
-    // On failure, give up bidi resolving and reordering.
-    MutableData().is_bidi_enabled_ = false;
-    return;
-  }
-  if (bidi.Direction() == UBIDI_LTR) {
-    // All runs are LTR, no need to reorder.
-    MutableData().is_bidi_enabled_ = false;
+  NGInlineNodeData& data = MutableData();
+  if (!data.is_bidi_enabled_) {
+    data.SetBaseDirection(TextDirection::kLtr);
     return;
   }
 
-  Vector<NGInlineItem>& items = MutableData().items_;
+  NGBidiParagraph bidi;
+  data.text_content_.Ensure16Bit();
+  if (!bidi.SetParagraph(data.text_content_, Style())) {
+    // On failure, give up bidi resolving and reordering.
+    data.is_bidi_enabled_ = false;
+    data.SetBaseDirection(TextDirection::kLtr);
+    return;
+  }
+
+  data.SetBaseDirection(bidi.BaseDirection());
+
+  if (bidi.IsAllLtr()) {
+    // All runs are LTR, no need to reorder.
+    data.is_bidi_enabled_ = false;
+    return;
+  }
+
+  Vector<NGInlineItem>& items = data.items_;
   unsigned item_index = 0;
   for (unsigned start = 0; start < Data().text_content_.length();) {
     UBiDiLevel level;
     unsigned end = bidi.GetLogicalRun(start, &level);
     DCHECK_EQ(items[item_index].start_offset_, start);
     item_index = NGInlineItem::SetBidiLevel(items, item_index, end, level);
     start = end;
   }
   DCHECK_EQ(item_index, items.size());
 }
@@ skipping 208 matching lines @@
            item.Style() == item.GetLayoutObject()->Style());
   }
 #endif
 }
 
 String NGInlineNode::ToString() const {
   return String::Format("NGInlineNode");
 }
 
 }  // namespace blink