Skip to content

Commit

Permalink
Revert "Floats and out-of-flow objects may not be adjacent to anonymo…
Browse files Browse the repository at this point in the history
…us blocks."

This reverts commit 2394d0acf8bf0b0236b2646e4c823a57de7bd941.

Reason for revert: Caused ClusterFuzz regressions - 853522, 853537, 853538, 853540.

Original change's description:
> Floats and out-of-flow objects may not be adjacent to anonymous blocks.
>
> Floats and out-of-flow objects need to be true layout siblings of the
> inlines, or rendering will be wrong. This means that such objects should
> never be siblings of anonymous blocks, but rather inside them. This
> already works correctly for initial layout tree building, and also for
> many DOM manipulations. However, code was missing to satisfy this
> requirement if we removed a regular block that was a sibling of an
> anonymous block and either a float or out-of-flow positioned object.
>
> This even caused a crash triggered by ruby code, which ended up mixing
> inline and block children within the same container. That is not
> allowed. This happened in the MoveAllChildrenIncludingFloatsTo() call
> inside LayoutRubyBase::MoveBlockChildren(). Added a DCHECK to
> MoveAllChildrenIncludingFloatsTo() (which could fail prior to this fix);
> When moving children from one container to another, either both or none
> of the containers must have inline children.
>
> Bug: 852640
> Change-Id: I51d3de12c73ddd07d6b4c1aa55221b4f92359ca7
> Reviewed-on: https://chromium-review.googlesource.com/1102690
> Reviewed-by: Emil A Eklund <[email protected]>
> Commit-Queue: Morten Stenshorne <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#567882}

[email protected],[email protected]

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 852640
Change-Id: I0af60d9eac770f21b6a0fbeccf88bb43d5efd6fb
Reviewed-on: https://chromium-review.googlesource.com/1103503
Reviewed-by: Abhishek Arya <[email protected]>
Commit-Queue: Abhishek Arya <[email protected]>
Cr-Commit-Position: refs/heads/master@{#567914}
  • Loading branch information
inferno-chromium authored and chromium-wpt-export-bot committed Jun 17, 2018
1 parent ab2182a commit f055233
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 44 deletions.
22 changes: 0 additions & 22 deletions css/CSS2/abspos/remove-block-between-inline-and-abspos.html

This file was deleted.

22 changes: 0 additions & 22 deletions css/CSS2/floats/remove-block-between-inline-and-float.html

This file was deleted.

0 comments on commit f055233

Please sign in to comment.