Commit 561eff05 authored by Aleks Totic's avatar Aleks Totic Committed by Commit Bot

Fix multicol abspos DCHECKs

Bug: 740993
Change-Id: I9bc0340fcf8609702187a79f9d7ed07a5c781e4d
Reviewed-on: https://chromium-review.googlesource.com/764042
Commit-Queue: Aleks Totic <atotic@chromium.org>
Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#516021}
parent f1a949bd
...@@ -113,7 +113,7 @@ scoped_refptr<NGLayoutResult> NGColumnLayoutAlgorithm::Layout() { ...@@ -113,7 +113,7 @@ scoped_refptr<NGLayoutResult> NGColumnLayoutAlgorithm::Layout() {
ToNGPhysicalBoxFragment(result->PhysicalFragment().get())); ToNGPhysicalBoxFragment(result->PhysicalFragment().get()));
NGLogicalOffset logical_offset(column_inline_offset, column_block_offset); NGLogicalOffset logical_offset(column_inline_offset, column_block_offset);
container_builder_.AddChild(column, logical_offset); container_builder_.AddChild(result, logical_offset);
intrinsic_block_size = std::max( intrinsic_block_size = std::max(
intrinsic_block_size, intrinsic_block_size,
......
...@@ -51,6 +51,9 @@ class CORE_EXPORT NGContainerFragmentBuilder : public NGBaseFragmentBuilder { ...@@ -51,6 +51,9 @@ class CORE_EXPORT NGContainerFragmentBuilder : public NGBaseFragmentBuilder {
virtual NGContainerFragmentBuilder& AddChild(scoped_refptr<NGLayoutResult>, virtual NGContainerFragmentBuilder& AddChild(scoped_refptr<NGLayoutResult>,
const NGLogicalOffset&); const NGLogicalOffset&);
// This version of AddChild will not propagate floats/out_of_flow.
// Use the AddChild(NGLayoutResult) variant if NGLayoutResult is available.
virtual NGContainerFragmentBuilder& AddChild( virtual NGContainerFragmentBuilder& AddChild(
scoped_refptr<NGPhysicalFragment>, scoped_refptr<NGPhysicalFragment>,
const NGLogicalOffset&); const NGLogicalOffset&);
......
...@@ -56,7 +56,7 @@ scoped_refptr<NGLayoutResult> NGPageLayoutAlgorithm::Layout() { ...@@ -56,7 +56,7 @@ scoped_refptr<NGLayoutResult> NGPageLayoutAlgorithm::Layout() {
scoped_refptr<NGPhysicalBoxFragment> page( scoped_refptr<NGPhysicalBoxFragment> page(
ToNGPhysicalBoxFragment(result->PhysicalFragment().get())); ToNGPhysicalBoxFragment(result->PhysicalFragment().get()));
container_builder_.AddChild(page, page_offset); container_builder_.AddChild(result, page_offset);
NGBoxFragment logical_fragment(writing_mode, *page); NGBoxFragment logical_fragment(writing_mode, *page);
intrinsic_block_size = intrinsic_block_size =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment