[layoutng] Set the intrinsic content logical height on the old layout tree

third_party/WebKit/Source/core/layout/ng/ng_box.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_box.h"
 
 #include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_direction.h"
 #include "core/layout/ng/ng_fragment.h"
 #include "core/layout/ng/ng_fragment_builder.h"
+#include "core/layout/ng/ng_length_utils.h"
 #include "core/layout/ng/ng_writing_mode.h"
 
 namespace blink {
 NGBox::NGBox(LayoutObject* layout_object)
     : layout_box_(toLayoutBox(layout_object)) {
   DCHECK(layout_box_);
 }
 
 NGBox::NGBox(ComputedStyle* style) : layout_box_(nullptr), style_(style) {
   DCHECK(style_);
@@ skipping 12 matching lines @@
         FromPlatformWritingMode(Style()->getWritingMode()), constraint_space);
 
     NGPhysicalFragment* fragment = nullptr;
     if (!algorithm_->Layout(child_constraint_space, &fragment))
       return false;
     fragment_ = fragment;
 
     if (layout_box_) {
       layout_box_->setWidth(fragment_->Width());
       layout_box_->setHeight(fragment_->Height());
+      NGBoxStrut border_and_padding =
+          computeBorders(*Style()) +
+          computePadding(*constraint_space, *Style());
+      LayoutUnit intrinsic_logical_height =
+          layout_box_->style()->isHorizontalWritingMode()
+              ? fragment_->HeightOverflow()
+              : fragment_->WidthOverflow();
+      intrinsic_logical_height -= border_and_padding.BlockSum();
+      layout_box_->setIntrinsicContentLogicalHeight(intrinsic_logical_height);
 
       // Ensure the position of the children are copied across to the
       // LayoutObject tree.
       for (NGBox* box = FirstChild(); box; box = box->NextSibling()) {
         if (box->fragment_)
           box->PositionUpdated();
       }
 
       if (layout_box_->isLayoutBlock())
         toLayoutBlock(layout_box_)->layoutPositionedObjects(true);
@@ skipping 73 matching lines @@
 
 bool NGBox::CanUseNewLayout() {
   if (!layout_box_)
     return true;
   if (!layout_box_->isLayoutBlockFlow())
     return false;
   const LayoutBlockFlow* block_flow = toLayoutBlockFlow(layout_box_);
   return !block_flow->childrenInline() || !block_flow->firstChild();
 }
 }  // namespace blink