1 files changed, 17 insertions, 19 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_input_node.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_input_node.cc
index f44232ed371..c6cc9856596 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_input_node.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_input_node.cc
@@ -4,12 +4,12 @@
 
 #include "third_party/blink/renderer/core/layout/ng/ng_layout_input_node.h"
 
+#include "third_party/blink/renderer/core/layout/geometry/logical_size.h"
 #include "third_party/blink/renderer/core/layout/intrinsic_sizing_info.h"
 #include "third_party/blink/renderer/core/layout/layout_replaced.h"
 #include "third_party/blink/renderer/core/layout/layout_table_cell.h"
 #include "third_party/blink/renderer/core/layout/layout_view.h"
 #include "third_party/blink/renderer/core/layout/min_max_size.h"
-#include "third_party/blink/renderer/core/layout/ng/geometry/ng_logical_size.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h"
 #include "third_party/blink/renderer/core/layout/ng/list/layout_ng_list_marker.h"
 #include "third_party/blink/renderer/core/layout/ng/ng_block_node.h"
@@ -19,7 +19,7 @@
 namespace blink {
 namespace {
 
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
 void AppendNodeToString(NGLayoutInputNode node,
                         StringBuilder* string_builder,
                         unsigned indent = 2) {
@@ -62,15 +62,6 @@ void AppendNodeToString(NGLayoutInputNode node,
 
 }  // namespace
 
-scoped_refptr<const NGLayoutResult> NGLayoutInputNode::Layout(
-    const NGConstraintSpace& space,
-    const NGBreakToken* break_token,
-    NGInlineChildLayoutContext* context) {
-  auto* inline_node = DynamicTo<NGInlineNode>(this);
-  return inline_node ? inline_node->Layout(space, break_token, context)
-                     : To<NGBlockNode>(*this).Layout(space, break_token);
-}
-
 MinMaxSize NGLayoutInputNode::ComputeMinMaxSize(
     WritingMode writing_mode,
     const MinMaxSizeInput& input,
@@ -83,12 +74,20 @@ MinMaxSize NGLayoutInputNode::ComputeMinMaxSize(
 void NGLayoutInputNode::IntrinsicSize(
     base::Optional<LayoutUnit>* computed_inline_size,
     base::Optional<LayoutUnit>* computed_block_size,
-    NGLogicalSize* aspect_ratio) const {
+    LogicalSize* aspect_ratio) const {
   DCHECK(IsReplaced());
   if (ShouldApplySizeContainment()) {
     *computed_inline_size = LayoutUnit();
     *computed_block_size = LayoutUnit();
-    *aspect_ratio = NGLogicalSize(LayoutUnit(), LayoutUnit());
+    *aspect_ratio = LogicalSize(LayoutUnit(), LayoutUnit());
+    return;
+  }
+  if (DisplayLockInducesSizeContainment()) {
+    *computed_inline_size =
+        GetDisplayLockContext().GetLockedContentLogicalWidth();
+    *computed_block_size =
+        GetDisplayLockContext().GetLockedContentLogicalHeight();
+    *aspect_ratio = LogicalSize(**computed_inline_size, **computed_block_size);
     return;
   }
   IntrinsicSizingInfo legacy_sizing_info;
@@ -99,8 +98,8 @@ void NGLayoutInputNode::IntrinsicSize(
   if (legacy_sizing_info.has_height)
     *computed_block_size = LayoutUnit(legacy_sizing_info.size.Height());
   *aspect_ratio =
-      NGLogicalSize(LayoutUnit(legacy_sizing_info.aspect_ratio.Width()),
-                    LayoutUnit(legacy_sizing_info.aspect_ratio.Height()));
+      LogicalSize(LayoutUnit(legacy_sizing_info.aspect_ratio.Width()),
+                  LayoutUnit(legacy_sizing_info.aspect_ratio.Height()));
 }
 
 LayoutUnit NGLayoutInputNode::IntrinsicPaddingBlockStart() const {
@@ -119,11 +118,10 @@ NGLayoutInputNode NGLayoutInputNode::NextSibling() {
                      : To<NGBlockNode>(*this).NextSibling();
 }
 
-NGPhysicalSize NGLayoutInputNode::InitialContainingBlockSize() const {
+PhysicalSize NGLayoutInputNode::InitialContainingBlockSize() const {
   IntSize icb_size =
       GetDocument().GetLayoutView()->GetLayoutSize(kExcludeScrollbars);
-  return NGPhysicalSize{LayoutUnit(icb_size.Width()),
-                        LayoutUnit(icb_size.Height())};
+  return PhysicalSize(icb_size);
 }
 
 const NGPaintFragment* NGLayoutInputNode::PaintFragment() const {
@@ -136,7 +134,7 @@ String NGLayoutInputNode::ToString() const {
                      : To<NGBlockNode>(*this).ToString();
 }
 
-#ifndef NDEBUG
+#if DCHECK_IS_ON()
 void NGLayoutInputNode::ShowNodeTree() const {
   StringBuilder string_builder;
   string_builder.Append(".:: LayoutNG Node Tree ::.\n");