Merge LayoutNGInline into LayoutNG runtime enabled feature

third_party/WebKit/Source/core/layout/ng/ng_block_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/ng_block_node.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
@@ skipping 181 matching lines @@
 
 DEFINE_TRACE(NGBlockNode) {
   visitor->trace(next_sibling_);
   visitor->trace(first_child_);
   NGLayoutInputNode::trace(visitor);
 }
 
 bool NGBlockNode::CanUseNewLayout() {
   if (!layout_box_->isLayoutBlockFlow())
     return false;
-  return RuntimeEnabledFeatures::layoutNGInlineEnabled() ||
-         !HasInlineChildren();
+  return RuntimeEnabledFeatures::layoutNGEnabled() || !HasInlineChildren();

[cbiesinger1, 2017/03/21 23:07:11]

You can now always return true here. This code is only executed if ng is
enabled.

 }
 
 bool NGBlockNode::HasInlineChildren() {
   if (!layout_box_->isLayoutBlockFlow())
     return false;
 
   const LayoutBlockFlow* block_flow = toLayoutBlockFlow(layout_box_);
   if (!block_flow->childrenInline())
     return false;
   LayoutObject* child = block_flow->firstChild();
@@ skipping 113 matching lines @@
 
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink