Commit 991ca914 authored by avi's avatar avi Committed by Commit Bot

Revert of [LayoutNG] Set InlineBoxWrapper when copying fragments to LayoutBox...

Revert of [LayoutNG] Set InlineBoxWrapper when copying fragments to LayoutBox (patchset #3 id:40001 of https://codereview.chromium.org/2975663002/ )

Reason for revert:
WebKit layout bots all started failing after this commit.

webkit_tests webkit_tests

Total tests: 66971
* Passed: 56304 (56144 expected, 160 unexpected)
* Skipped: 9131 (9131 expected, 0 unexpected)
* Failed: 1447 (1446 expected, >>>1 unexpected<<<)
* Flaky: 89 (89 expected, 0 unexpected)

Unexpected Failures:
* virtual/layout_ng/fast/block/float/rubybase-children-moved-crash.html

Original issue's description:
> [LayoutNG] Set InlineBoxWrapper when copying fragments to LayoutBox
>
> This patch fixes to set InlineBoxWrapper when copying fragments to
> LayoutBox.
>
> To create InlineBox'es, NGInlineNode::CopyFragmentDataToLayoutBox()
> calls LayoutBlockFlow::ConstructLine(), but it does not set
> InlineBoxWrapper.
>
> LayoutBlockFlow::ComputeBlockDirectionPositionsForLine() sets
> InlineBoxWrapper but LayoutNG does not call this function. It does
> several other things, but SetInlineBoxWrapper() is the only thing needed
> for CopyFragmentDataToLayoutBox().
>
> BUG=636993, 739365
>
> Review-Url: https://codereview.chromium.org/2975663002
> Cr-Commit-Position: refs/heads/master@{#485142}
> Committed: https://chromium.googlesource.com/chromium/src/+/981fa39e2dde70f5933ea2db88123582ab955632

TBR=eae@chromium.org,ikilpatrick@chromium.org,kojii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=636993, 739365

Review-Url: https://codereview.chromium.org/2977483002
Cr-Commit-Position: refs/heads/master@{#485155}
parent 70fcb0bf
...@@ -592,7 +592,7 @@ crbug.com/635619 virtual/layout_ng/fast/block/float/034.html [ Failure ] ...@@ -592,7 +592,7 @@ crbug.com/635619 virtual/layout_ng/fast/block/float/034.html [ Failure ]
crbug.com/635619 virtual/layout_ng/fast/block/float/035.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/035.html [ Failure ]
crbug.com/635619 virtual/layout_ng/fast/block/float/add-float-back-to-anonymous-block.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/add-float-back-to-anonymous-block.html [ Failure ]
crbug.com/719615 virtual/layout_ng/fast/block/float/add-inlines-in-block-children-block.html [ Failure ] crbug.com/719615 virtual/layout_ng/fast/block/float/add-inlines-in-block-children-block.html [ Failure ]
crbug.com/635619 virtual/layout_ng/fast/block/float/assert-when-moving-float.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/assert-when-moving-float.html [ Crash ]
crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-2.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-2.html [ Failure ]
crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-3.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-3.html [ Failure ]
crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-4.html [ Failure ] crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-margin-top-4.html [ Failure ]
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "core/layout/LayoutBlockFlow.h" #include "core/layout/LayoutBlockFlow.h"
#include "core/layout/LayoutObject.h" #include "core/layout/LayoutObject.h"
#include "core/layout/LayoutText.h" #include "core/layout/LayoutText.h"
#include "core/layout/api/LineLayoutAPIShim.h"
#include "core/layout/line/LineInfo.h" #include "core/layout/line/LineInfo.h"
#include "core/layout/line/RootInlineBox.h" #include "core/layout/line/RootInlineBox.h"
#include "core/layout/ng/inline/ng_bidi_paragraph.h" #include "core/layout/ng/inline/ng_bidi_paragraph.h"
...@@ -149,10 +148,6 @@ unsigned PlaceInlineBoxChildren( ...@@ -149,10 +148,6 @@ unsigned PlaceInlineBoxChildren(
if (inline_box->GetLineLayoutItem().IsBox()) { if (inline_box->GetLineLayoutItem().IsBox()) {
LineLayoutBox box(inline_box->GetLineLayoutItem()); LineLayoutBox box(inline_box->GetLineLayoutItem());
box.SetLocation(inline_box->Location()); box.SetLocation(inline_box->Location());
LayoutObject* layout_object = LineLayoutAPIShim::LayoutObjectFrom(box);
if (layout_object->IsAtomicInlineLevel())
ToLayoutBox(layout_object)->SetInlineBoxWrapper(inline_box);
} }
} }
......
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