[LayoutNG] Change how content editable forces legacy layout

This patch changes how editing forces legacy layout to the one
added for form controls[1] to use legacy layout tree for nested editable, e.g.
  <div contenteditable>
  legacy layout tree
    <div contenteditable=false>
      non-editable block in editable block should be legacy
    </div>
  </div>

This patch continues http://crrev.com/c/880542

[1] http://crrev.com/c/875511 Change form controls not to use LayoutNG

Bug: 714962
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: I78d44fc82b3de5e647b67ee6aa7733db62e344b8
Reviewed-on: https://chromium-review.googlesource.com/880530
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531861}

third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG

@@ -123,6 +123,7 @@ crbug.com/591099 accessibility/scroll-div-horiz-sends-notification.html [ Failur
 crbug.com/714962 accessibility/selection-events.html [ Failure ]
 crbug.com/714962 accessibility/set-selection-link.html [ Failure ]
 crbug.com/591099 accessibility/slider-thumb-bounds.html [ Crash Pass ]
+crbug.com/591099 accessibility/spelling-markers.html [ Failure ]
 crbug.com/591099 accessibility/table-cells.html [ Failure ]
 crbug.com/714962 accessibility/table-detection.html [ Failure ]
 crbug.com/591099 accessibility/table-header-column-row.html [ Failure ]
@@ -1013,7 +1014,9 @@ crbug.com/591099 editing/execCommand/5138441.html [ Failure ]
 crbug.com/591099 editing/execCommand/5142012-1.html [ Failure ]
 crbug.com/591099 editing/execCommand/5190926.html [ Failure ]
 crbug.com/591099 editing/execCommand/5569741.html [ Failure ]
+crbug.com/591099 editing/execCommand/align-in-span.html [ Failure ]
 crbug.com/714962 editing/execCommand/button.html [ Failure Pass ]
+crbug.com/805784 editing/execCommand/dispatch-text-event-crash.html [ Crash ]
 crbug.com/591099 editing/execCommand/findString-2.html [ Failure ]
 crbug.com/591099 editing/execCommand/findString.html [ Failure ]
 crbug.com/591099 editing/execCommand/format-block-from-range-selection.html [ Failure ]
@@ -1021,6 +1024,7 @@ crbug.com/591099 editing/execCommand/format-block-multiple-paragraphs-in-pre.htm
 crbug.com/591099 editing/execCommand/format-block-multiple-paragraphs.html [ Failure ]
 crbug.com/591099 editing/execCommand/format-block-with-trailing-br.html [ Failure ]
 crbug.com/591099 editing/execCommand/insertImage.html [ Failure ]
+crbug.com/591099 editing/execCommand/insertNewLineInQuotedContent-outside-quote.html [ Failure ]
 crbug.com/591099 editing/execCommand/outdent-collapse-table-crash-2.html [ Crash ]
 crbug.com/591099 editing/execCommand/outdent-multiparagraph-list.html [ Failure ]
 crbug.com/591099 editing/execCommand/query-command-state.html [ Timeout ]
@@ -1029,6 +1033,7 @@ crbug.com/591099 editing/execCommand/queryCommandState-02.html [ Failure ]
 crbug.com/714962 editing/execCommand/remove-format-multiple-elements-mac.html [ Failure ]
 crbug.com/714962 editing/execCommand/remove-format-multiple-elements-win.html [ Failure ]
 crbug.com/591099 editing/execCommand/remove-list-from-range-selection.html [ Failure ]
+crbug.com/591099 editing/execCommand/replaceSelectorCommand-crash.html [ Crash ]
 crbug.com/591099 editing/input/caret-at-the-edge-of-contenteditable.html [ Failure ]
 crbug.com/591099 editing/input/linux_ltr_composition_underline.html [ Failure ]
 crbug.com/591099 editing/input/linux_rtl_composition_underline.html [ Failure ]
@@ -1120,6 +1125,7 @@ crbug.com/591099 editing/selection/4960137.html [ Failure ]
 crbug.com/591099 editing/selection/4975120.html [ Failure ]
 crbug.com/591099 editing/selection/5099303.html [ Failure ]
 crbug.com/591099 editing/selection/5131716-1.html [ Failure ]
+crbug.com/591099 editing/selection/5131716-2.html [ Failure ]
 crbug.com/591099 editing/selection/5131716-3.html [ Failure ]
 crbug.com/591099 editing/selection/5131716-4.html [ Failure ]
 crbug.com/591099 editing/selection/5195166-2.html [ Failure ]
@@ -1133,6 +1139,7 @@ crbug.com/591099 editing/selection/caret-at-bidi-boundary.html [ Failure ]
 crbug.com/714962 editing/selection/caret-in-div-containing-empty-block.html [ Failure ]
 crbug.com/591099 editing/selection/caret-ltr-right.html [ Failure ]
 crbug.com/591099 editing/selection/caret-ltr.html [ Failure ]
+crbug.com/591099 editing/selection/clear-selection-crash.html [ Crash ]
 crbug.com/591099 editing/selection/clear-selection.html [ Failure ]
 crbug.com/714962 editing/selection/click-in-focusable-link-should-not-clear-selection.html [ Failure ]
 crbug.com/714962 editing/selection/click-on-body-margin.html [ Failure ]
@@ -1140,12 +1147,13 @@ crbug.com/591099 editing/selection/contenteditable-click-inside.html [ Failure ]
 crbug.com/591099 editing/selection/continuations-with-move-caret-to-boundary.html [ Failure ]
 crbug.com/591099 editing/selection/continuations-without-move-caret-to-boundary.html [ Failure ]
 crbug.com/714962 editing/selection/deleteFromDocument-undo-crash.html [ Crash ]
+crbug.com/591099 editing/selection/designmode-no-caret.html [ Failure ]
 crbug.com/591099 editing/selection/display-table-text.html [ Failure ]
 crbug.com/591099 editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-ltr-mixed.html [ Failure ]
 crbug.com/591099 editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-mixed.html [ Failure ]
 crbug.com/591099 editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl.html [ Failure ]
 crbug.com/591099 editing/selection/dont-select-text-overflow-ellipsis-when-wrapping.html [ Failure ]
-crbug.com/591099 editing/selection/doubleclick-beside-cr-span.html [ Timeout ]
+crbug.com/591099 editing/selection/doubleclick-beside-cr-span.html [ Timeout Failure ]
 crbug.com/714962 editing/selection/drag-drop-events.html [ Failure ]
 crbug.com/714962 editing/selection/drag-drop-restore.html [ Failure ]
 crbug.com/591099 editing/selection/drag-in-iframe.html [ Failure ]
@@ -1169,6 +1177,7 @@ crbug.com/591099 editing/selection/focus-body.html [ Failure ]
 crbug.com/591099 editing/selection/home-end.html [ Timeout ]
 crbug.com/591099 editing/selection/inactive-selection.html [ Failure ]
 crbug.com/591099 editing/selection/inline-closest-leaf-child.html [ Failure ]
+crbug.com/591099 editing/selection/keydown-without-selection-crash.html [ Crash ]
 crbug.com/714962 editing/selection/last-empty-inline.html [ Failure ]
 crbug.com/591099 editing/selection/line-wrap-1.html [ Failure ]
 crbug.com/591099 editing/selection/line-wrap-2.html [ Failure ]
@@ -1240,8 +1249,10 @@ crbug.com/591099 editing/selection/select-text-overflow-ellipsis-mixed-in-ltr.ht
 crbug.com/591099 editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-2.html [ Failure ]
 crbug.com/591099 editing/selection/select-text-overflow-ellipsis-mixed-in-rtl.html [ Failure ]
 crbug.com/591099 editing/selection/select-text-overflow-ellipsis.html [ Failure ]
+crbug.com/591099 editing/selection/select_all/select_all_details_crash.html [ Failure ]
 crbug.com/591099 editing/selection/selection-3748164-fix.html [ Failure ]
 crbug.com/591099 editing/selection/selection-button-text.html [ Failure ]
+crbug.com/591099 editing/selection/selection-in-iframe-removed-crash.html [ Crash ]
 crbug.com/591099 editing/selection/selection-invalid-offset.html [ Failure ]
 crbug.com/591099 editing/selection/shift-click.html [ Failure ]
 crbug.com/714962 editing/selection/skip-over-contenteditable.html [ Failure ]
@@ -1254,11 +1265,13 @@ crbug.com/591099 editing/selection/word-granularity.html [ Failure ]
 crbug.com/591099 editing/selection/wrapped-line-caret-1.html [ Failure ]
 crbug.com/591099 editing/selection/wrapped-line-caret-2.html [ Failure ]
 crbug.com/714962 editing/shadow/compare-positions-in-nested-shadow.html [ Failure ]
+crbug.com/591099 editing/spelling/design-mode-spellcheck-off.html [ Failure ]
 crbug.com/591099 editing/style/4916887.html [ Failure ]
 crbug.com/591099 editing/style/5065910.html [ Failure ]
 crbug.com/591099 editing/style/5084241.html [ Failure ]
 crbug.com/591099 editing/style/5228141.html [ Failure ]
 crbug.com/591099 editing/style/5279521.html [ Failure ]
+crbug.com/805784 editing/style/apply-style-crash2.html [ Crash ]
 crbug.com/591099 editing/style/block-styles-007.html [ Failure ]
 crbug.com/591099 editing/style/highlight.html [ Failure ]
 crbug.com/591099 editing/style/remove-underline-across-paragraph-in-bold.html [ Failure ]
@@ -1269,6 +1282,7 @@ crbug.com/591099 editing/text-iterator/findString.html [ Timeout ]
 crbug.com/591099 editing/undo/crash-redo-with-iframes.html [ Failure ]
 crbug.com/591099 editing/undo/undo-deleteWord.html [ Failure ]
 crbug.com/591099 editing/undo/undo-smart-delete-reversed-selection.html [ Failure ]
+crbug.com/591099 editing/unsupported-content/list-delete-001.html [ Failure ]
 crbug.com/591099 editing/unsupported-content/table-delete-002.html [ Failure ]
 crbug.com/591099 editing/unsupported-content/table-type-after.html [ Failure ]
 crbug.com/591099 editing/unsupported-content/table-type-before.html [ Failure ]
@@ -2669,7 +2683,7 @@ crbug.com/591099 fast/css-generated-content/after-duplicated-after-split.html [
 crbug.com/591099 fast/css-generated-content/after-order.html [ Failure ]
 crbug.com/591099 fast/css-generated-content/before-with-first-letter.html [ Failure ]
 crbug.com/591099 fast/css-generated-content/beforeAfter-interdocument.html [ Failure ]
-crbug.com/591099 fast/css-generated-content/crash-selection-editing-removes-pseudo.html [ Failure ]
+crbug.com/591099 fast/css-generated-content/crash-selection-editing-removes-pseudo.html [ Failure Crash ]
 crbug.com/591099 fast/css-generated-content/empty-first-letter-with-columns-crash.html [ Crash ]
 crbug.com/591099 fast/css-generated-content/first-letter-in-nested-before-table.html [ Failure ]
 crbug.com/591099 fast/css-generated-content/first-letter-in-nested-before.html [ Failure ]
@@ -2906,6 +2920,7 @@ crbug.com/591099 fast/css/first-letter-hover.html [ Failure ]
 crbug.com/714962 fast/css/first-letter-range-insert.html [ Failure ]
 crbug.com/591099 fast/css/first-letter-recalculation.html [ Failure ]
 crbug.com/591099 fast/css/first-letter-set-text.html [ Failure ]
+crbug.com/591099 fast/css/first-letter-text-fragment-crash.html [ Failure ]
 crbug.com/591099 fast/css/first-letter-visibility.html [ Failure ]
 crbug.com/714962 fast/css/first-line-change-color-direct.html [ Failure ]
 crbug.com/714962 fast/css/first-line-change-color.html [ Failure ]
@@ -3334,6 +3349,7 @@ crbug.com/591099 fast/events/context-no-deselect.html [ Failure ]
 crbug.com/714962 fast/events/contextmenu-follows-focus.html [ Failure ]
 crbug.com/714962 fast/events/contextmenu-scrolled-page-with-frame.html [ Failure ]
 crbug.com/714962 fast/events/document-elementFromPoint.html [ Failure ]
+crbug.com/591099 fast/events/dom-character-data-modified-textarea-crash.html [ Crash ]
 crbug.com/591099 fast/events/domactivate-sets-underlying-click-event-as-handled.html [ Crash Failure ]
 crbug.com/714962 fast/events/drag-and-drop-subframe-dataTransfer.html [ Timeout ]
 crbug.com/714962 fast/events/drag-dataTransferItemList-file-handling.html [ Failure ]
@@ -4540,6 +4556,7 @@ crbug.com/591099 fast/parser/entities-in-xhtml.xhtml [ Failure ]
 crbug.com/591099 fast/parser/entity-comment-in-style.html [ Failure ]
 crbug.com/591099 fast/parser/entity-comment-in-textarea.html [ Failure ]
 crbug.com/591099 fast/parser/fonts.html [ Failure ]
+crbug.com/591099 fast/parser/nested-fragment-parser-crash.html [ Failure ]
 crbug.com/591099 fast/parser/nofoo-tags-inside-paragraph.html [ Failure ]
 crbug.com/591099 fast/parser/noscript-with-javascript-disabled.html [ Failure ]
 crbug.com/591099 fast/parser/open-comment-in-style.html [ Failure ]
@@ -4893,7 +4910,7 @@ crbug.com/714962 fast/table/table-cell-before-after-content-around-table.html [
 crbug.com/714962 fast/table/table-cell-before-child-in-block.html [ Failure ]
 crbug.com/714962 fast/table/table-cell-before-child-in-table.html [ Failure ]
 crbug.com/591099 fast/table/table-display-types-vertical.html [ Failure ]
-crbug.com/591099 fast/table/table-overflow-crash.html [ Pass ]
+crbug.com/591099 fast/table/table-overflow-crash.html [ Failure ]
 crbug.com/591099 fast/table/table-parts-not-ortho-writing-mode-root.html [ Failure ]
 crbug.com/714962 fast/table/table-row-after-child-in-block.html [ Failure ]
 crbug.com/714962 fast/table/table-row-before-after-content-around-block.html [ Failure ]
@@ -5768,6 +5785,7 @@ crbug.com/591099 images/color-profile-layer.html [ Failure ]
 crbug.com/591099 images/color-profile-mask-image-svg.html [ Failure ]
 crbug.com/591099 images/color-profile-munsell-adobe-to-srgb.html [ Failure ]
 crbug.com/591099 images/color-profile-svg-foreign-object.html [ Failure ]
+crbug.com/591099 images/crash-bad-cast.html [ Failure ]
 crbug.com/591099 images/cross-fade-background-size.html [ Failure ]
 crbug.com/591099 images/cross-fade-blending.html [ Failure ]
 crbug.com/591099 images/cross-fade-invalidation.html [ Failure ]
@@ -6556,6 +6574,7 @@ crbug.com/591099 paint/overflow/non-composited-fixed-position-descendant.html [
 crbug.com/591099 paint/pagination/composited-paginated-inline.html [ Failure ]
 crbug.com/591099 paint/pagination/pagination-change-clip-crash.html [ Failure ]
 crbug.com/591099 paint/printing/print-box-shadow.html [ Failure ]
+crbug.com/591099 paint/selection/drag-caret.html [ Crash ]
 crbug.com/714962 paint/selection/text-selection-drag.html [ Failure ]
 crbug.com/591099 paint/selection/text-selection-inline-block-rtl.html [ Failure ]
 crbug.com/591099 paint/selection/text-selection-inline-block.html [ Failure ]
@@ -6966,6 +6985,7 @@ crbug.com/591099 svg/text/selection-dragging-outside-1.html [ Failure ]
 crbug.com/591099 svg/text/selection-dragging-outside-2.html [ Failure ]
 crbug.com/591099 svg/text/selection-dragging-outside-3.html [ Failure ]
 crbug.com/591099 svg/text/small-fonts-in-html5.html [ Failure ]
+crbug.com/591099 svg/text/text-layout-crash.html [ Failure ]
 crbug.com/714962 svg/text/text-outline-2.html [ Failure ]
 crbug.com/591099 svg/text/text-repaint-rects.xhtml [ Failure ]
 crbug.com/714962 svg/text/text-selection-text-06-t.svg [ Failure ]
@@ -7298,6 +7318,7 @@ crbug.com/591099 virtual/gpu-rasterization/images/color-profile-mask-image-svg.h
 crbug.com/591099 virtual/gpu-rasterization/images/color-profile-munsell-adobe-to-srgb.html [ Failure ]
 crbug.com/591099 virtual/gpu-rasterization/images/color-profile-reflection.html [ Failure ]
 crbug.com/591099 virtual/gpu-rasterization/images/color-profile-svg-foreign-object.html [ Failure ]
+crbug.com/591099 virtual/gpu-rasterization/images/crash-bad-cast.html [ Failure ]
 crbug.com/591099 virtual/gpu-rasterization/images/cross-fade-background-size.html [ Failure ]
 crbug.com/591099 virtual/gpu-rasterization/images/cross-fade-blending.html [ Failure ]
 crbug.com/591099 virtual/gpu-rasterization/images/cross-fade-invalidation.html [ Failure ]
@@ -7442,6 +7463,7 @@ crbug.com/591099 virtual/mouseevent_fractional/fast/events/context-no-deselect.h
 crbug.com/714962 virtual/mouseevent_fractional/fast/events/contextmenu-follows-focus.html [ Failure ]
 crbug.com/714962 virtual/mouseevent_fractional/fast/events/contextmenu-scrolled-page-with-frame.html [ Failure ]
 crbug.com/714962 virtual/mouseevent_fractional/fast/events/document-elementFromPoint.html [ Failure ]
+crbug.com/591099 virtual/mouseevent_fractional/fast/events/dom-character-data-modified-textarea-crash.html [ Crash ]
 crbug.com/591099 virtual/mouseevent_fractional/fast/events/domactivate-sets-underlying-click-event-as-handled.html [ Crash Failure ]
 crbug.com/714962 virtual/mouseevent_fractional/fast/events/drag-and-drop-subframe-dataTransfer.html [ Timeout ]
 crbug.com/714962 virtual/mouseevent_fractional/fast/events/drag-dataTransferItemList-file-handling.html [ Failure ]

third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

@@ -640,19 +640,21 @@ void StyleAdjuster::AdjustComputedStyle(StyleResolverState& state,
     }
   }
 
-  if (RuntimeEnabledFeatures::LayoutNGEnabled()) {
+  if (RuntimeEnabledFeatures::LayoutNGEnabled() && !style.ForceLegacyLayout()) {
     // Form controls are not supported yet.
-    if (!style.ForceLegacyLayout() && element &&
-        element->ShouldForceLegacyLayout()) {
+    if (element && element->ShouldForceLegacyLayout()) {
       style.SetForceLegacyLayout(true);
     }
 
     // TODO(layout-dev): Once LayoutNG handles inline content editable, we
     // should get rid of following code fragment.
-    else if (style.UserModify() != EUserModify::kReadOnly &&
-             style.Display() == EDisplay::kInline &&
-             parent_style.UserModify() == EUserModify::kReadOnly) {
-      style.SetDisplay(EDisplay::kInlineBlock);
+    else if (style.UserModify() != EUserModify::kReadOnly) {
+      style.SetForceLegacyLayout(true);
+
+      if (style.Display() == EDisplay::kInline &&
+          parent_style.UserModify() == EUserModify::kReadOnly) {
+        style.SetDisplay(EDisplay::kInlineBlock);
+      }
     }
   }
 }

third_party/WebKit/Source/core/editing/LayoutSelectionTest.cpp

@@ -820,6 +820,7 @@ TEST_F(NGLayoutSelectionTest, MixedBlockFlowsAsSibling) {
 }
 
 TEST_F(NGLayoutSelectionTest, MixedBlockFlowsAnscestor) {
+  // Both "foo" and "bar" for DIV elements should be legacy LayoutBlock.
   const SelectionInDOMTree& selection = SetSelectionTextToBody(
       "<div contenteditable>f^oo"
       "<div contenteditable=false>ba|r</div></div>");
@@ -829,19 +830,10 @@ TEST_F(NGLayoutSelectionTest, MixedBlockFlowsAnscestor) {
   TEST_NEXT(IsLegacyBlockFlow, kContain, NotInvalidate);
   TEST_NEXT(IsLayoutNGBlockFlow, kContain, NotInvalidate);
   TEST_NEXT("foo", kStart, ShouldInvalidate);
-  TEST_NEXT(IsLayoutNGBlockFlow, kContain, NotInvalidate);
+  TEST_NEXT(IsLegacyBlockFlow, kContain, NotInvalidate);
   TEST_NEXT("bar", kEnd, ShouldInvalidate);
   TEST_NO_NEXT_LAYOUT_OBJECT();
   EXPECT_EQ(1u, Selection().LayoutSelectionStart().value());
-  LayoutObject* const bar = GetDocument()
-                                .body()
-                                ->firstChild()
-                                ->firstChild()
-                                ->nextSibling()
-                                ->firstChild()
-                                ->GetLayoutObject();
-  EXPECT_EQ(std::make_pair(0u, 2u), Selection().LayoutSelectionStartEndForNG(
-                                        GetNGPhysicalTextFragment(bar)));
 }
 
 TEST_F(NGLayoutSelectionTest, MixedBlockFlowsDecendant) {

third_party/WebKit/Source/core/layout/LayoutObject.cpp

@@ -113,8 +113,7 @@ static bool g_modify_layout_tree_structure_any_state = false;
 
 inline bool ShouldUseNewLayout(const ComputedStyle& style) {
   return RuntimeEnabledFeatures::LayoutNGEnabled() &&
-         !style.ForceLegacyLayout() &&
-         style.UserModify() == EUserModify::kReadOnly;
+         !style.ForceLegacyLayout();
 }
 
 template <typename Predicate>