Revert "Change the anonymous block in LayoutMenuList to a shadow element"

This reverts commit a98ef426.

Reason for revert: causes failures in ChromeVoxBackgroundTest,
see crbug.com/1049012.

Bug: 1049012

Original change's description:
> Change the anonymous block in LayoutMenuList to a shadow element
> 
> Enable rendering of the shadow element of <select>, and remove anonymous
> block in LayoutMenuList.
> 
> * HTMLOptionElement::ParseAttribute():
>   Update the shadow element content on option[label] change.
> 
> * HTMLSelectElement::UpdateFromElement():
>   Fold LayoutMenuList::UpdateFromElement() into here. If option_style_
>   and InnerElemnet's style are inconsistent, update InnerElement's
>   style.
> 
> * HTMLSelectElement::UpdateMenuListLabel()
>   Move the code in LayoutMenuList::UpdateInnerStyle() here.
>   Also, kick TextChanged ax notification which LayoutText::ForceSetText
>   did.
> 
> * MenuListInnerElement::CustomStyleForLayoutObject():
>   Set "display: block"
>   Add custom style which the anonymous block used.
> 
> * layout_menu_list.{h,cc}:
>   Remove a lot of code.
> 
> * ax_layout_object_test.cc:
>   Add tests to check if AXLayoutObject::StringValue() respects to
>   text-transform and -webkit-text-security.
> 
> * web_tests/accessibility/notification-listeners.html:
>   Remove TextChanged notification expectation. After this CL, <select>
>   won't notify TextChanged in this test scenario. The text is changed
>   before creating LayoutObject and AXLayoutObject.
> 
> 
> 
> Bug: 1040828
> Change-Id: Ia0c19f0897ab2d1461e457c83adceda2c0739f9f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024250
> Reviewed-by: Koji Ishii <kojii@chromium.org>
> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
> Commit-Queue: Kent Tamura <tkent@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#738416}

TBR=yosin@chromium.org,tkent@chromium.org,kojii@chromium.org

Change-Id: I804ec3898b907ff79531dbc6390c99e24b66965f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1040828
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036187
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738497}

third_party/blink/renderer/core/html/forms/html_option_element.cc

@@ -182,8 +182,6 @@ void HTMLOptionElement::ParseAttribute(
       SetSelected(!params.new_value.IsNull());
     PseudoStateChanged(CSSSelector::kPseudoDefault);
   } else if (name == html_names::kLabelAttr) {
-    if (HTMLSelectElement* select = OwnerSelectElement())
-      select->OptionElementChildrenChanged(*this);
     UpdateLabel();
   } else {
     HTMLElement::ParseAttribute(params);

third_party/blink/renderer/core/html/forms/html_select_element.cc

@@ -2327,42 +2327,18 @@ String HTMLSelectElement::UpdateFromElement() {
     }
   }
 
-  auto& inner_element = InnerElement();
-  const ComputedStyle* inner_style = inner_element.GetComputedStyle();
-  if (inner_style && option_style_ &&
-      ((option_style_->Direction() != inner_style->Direction() ||
-        option_style_->GetUnicodeBidi() != inner_style->GetUnicodeBidi()))) {
-    scoped_refptr<ComputedStyle> cloned_style =
-        ComputedStyle::Clone(*inner_style);
-    cloned_style->SetDirection(option_style_->Direction());
-    cloned_style->SetUnicodeBidi(option_style_->GetUnicodeBidi());
-    if (auto* inner_layout = inner_element.GetLayoutObject()) {
-      inner_layout->SetModifiedStyleOutsideStyleRecalc(
-          std::move(cloned_style), LayoutObject::ApplyStyleChanges::kYes);
-    } else {
-      inner_element.SetComputedStyle(std::move(cloned_style));
-    }
-  }
-  if (GetLayoutObject())
+  String stripped = text.StripWhiteSpace();
+  if (auto* layout_object = GetLayoutObject()) {
+    ToLayoutMenuList(layout_object)->SetText(stripped);
+    layout_object->UpdateFromElement();
     DidUpdateMenuListActiveOption(option);
-
-  return text.StripWhiteSpace();
+  }
+  return stripped;
 }
 
 void HTMLSelectElement::UpdateMenuListLabel(const String& label) {
-  if (!UsesMenuList())
-    return;
-  InnerElement().setTextContent(label);
-  // LayoutMenuList::ControlClipRect() depends on the content box size of
-  // inner_element.
-  if (auto* box = GetLayoutBox()) {
-    box->SetNeedsPaintPropertyUpdate();
-    if (auto* layer = box->Layer())
-      layer->SetNeedsCompositingInputsUpdate();
-
-    if (auto* cache = GetDocument().ExistingAXObjectCache())
-      cache->TextChanged(box);
-  }
+  if (UsesMenuList())
+    InnerElement().setTextContent(label);
 }
 
 const ComputedStyle* HTMLSelectElement::OptionStyle() const {

third_party/blink/renderer/core/html/forms/menu_list_inner_element.cc

@@ -19,8 +19,7 @@ MenuListInnerElement::CustomStyleForLayoutObject() {
   const ComputedStyle& parent_style = OwnerShadowHost()->ComputedStyleRef();
   scoped_refptr<ComputedStyle> style =
       ComputedStyle::CreateAnonymousStyleWithDisplay(parent_style,
-                                                     EDisplay::kBlock);
-  AdjustInnerStyle(parent_style, *style);
+                                                     EDisplay::kNone);
   return style;
 }
 

third_party/blink/renderer/core/html/forms/menu_list_inner_element.h

@@ -15,8 +15,6 @@ class MenuListInnerElement : public HTMLDivElement {
 
  private:
   scoped_refptr<ComputedStyle> CustomStyleForLayoutObject() override;
-  void AdjustInnerStyle(const ComputedStyle& parent_style,
-                        ComputedStyle& inner_style) const;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/layout/layout_menu_list.cc

@@ -33,7 +33,6 @@
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"
 #include "third_party/blink/renderer/core/html/forms/html_option_element.h"
 #include "third_party/blink/renderer/core/html/forms/html_select_element.h"
-#include "third_party/blink/renderer/core/html/forms/menu_list_inner_element.h"
 #include "third_party/blink/renderer/core/layout/layout_block_flow.h"
 #include "third_party/blink/renderer/core/layout/layout_text.h"
 #include "third_party/blink/renderer/core/layout/layout_theme.h"
@@ -44,6 +43,8 @@ namespace blink {
 
 LayoutMenuList::LayoutMenuList(Element* element)
     : LayoutFlexibleBox(element),
+      button_text_(nullptr),
+      inner_block_(nullptr),
       options_width_(0) {
   DCHECK(IsA<HTMLSelectElement>(element));
 }
@@ -52,15 +53,72 @@ LayoutMenuList::~LayoutMenuList() = default;
 
 bool LayoutMenuList::IsChildAllowed(LayoutObject* object,
                                     const ComputedStyle&) const {
-  // For a size=1 <select>, we only render the active option label through the
-  // InnerElement. We do not allow adding layout objects for options,
-  // optgroups, ::before, or ::after.
-  return object->GetNode() == &SelectElement()->InnerElement();
+  // For a size=1 <select>, we only render the active option through the
+  // anonymous inner_block_ plus button_text_. We do not allow adding layout
+  // objects for options or optgroups.
+  return object->IsAnonymous();
 }
 
-// TODO(tkent): Move this to menu_list_inner_element.cc.
-void MenuListInnerElement::AdjustInnerStyle(const ComputedStyle& parent_style,
-                                            ComputedStyle& inner_style) const {
+scoped_refptr<ComputedStyle> LayoutMenuList::CreateInnerStyle() {
+  scoped_refptr<ComputedStyle> inner_style =
+      ComputedStyle::CreateAnonymousStyleWithDisplay(StyleRef(),
+                                                     EDisplay::kBlock);
+
+  AdjustInnerStyle(StyleRef(), *inner_style);
+  return inner_style;
+}
+
+void LayoutMenuList::UpdateInnerStyle() {
+  DCHECK(inner_block_);
+  scoped_refptr<ComputedStyle> inner_style =
+      ComputedStyle::Clone(inner_block_->StyleRef());
+  AdjustInnerStyle(StyleRef(), *inner_style);
+  inner_block_->SetModifiedStyleOutsideStyleRecalc(std::move(inner_style),
+                                                   ApplyStyleChanges::kNo);
+  // LayoutMenuList::ControlClipRect() depends on inner_block_->ContentsSize().
+  SetNeedsPaintPropertyUpdate();
+  if (Layer())
+    Layer()->SetNeedsCompositingInputsUpdate();
+}
+
+void LayoutMenuList::CreateInnerBlock() {
+  if (inner_block_) {
+    DCHECK_EQ(FirstChild(), inner_block_);
+    DCHECK(!inner_block_->NextSibling());
+    return;
+  }
+
+  // Create an anonymous block.
+  LegacyLayout legacy =
+      ForceLegacyLayout() ? LegacyLayout::kForce : LegacyLayout::kAuto;
+  DCHECK(!FirstChild());
+  inner_block_ = LayoutBlockFlow::CreateAnonymous(&GetDocument(),
+                                                  CreateInnerStyle(), legacy);
+
+  button_text_ =
+      LayoutText::CreateEmptyAnonymous(GetDocument(), Style(), legacy);
+  // We need to set the text explicitly though it was specified in the
+  // constructor because LayoutText doesn't refer to the text
+  // specified in the constructor in a case of re-transforming.
+  inner_block_->AddChild(button_text_);
+  LayoutFlexibleBox::AddChild(inner_block_);
+
+  // LayoutMenuList::ControlClipRect() depends on inner_block_->ContentsSize().
+  SetNeedsPaintPropertyUpdate();
+  if (Layer())
+    Layer()->SetNeedsCompositingInputsUpdate();
+}
+
+bool LayoutMenuList::HasOptionStyleChanged(
+    const ComputedStyle& inner_style) const {
+  const ComputedStyle* option_style = SelectElement()->OptionStyle();
+  return option_style &&
+         ((option_style->Direction() != inner_style.Direction() ||
+           option_style->GetUnicodeBidi() != inner_style.GetUnicodeBidi()));
+}
+
+void LayoutMenuList::AdjustInnerStyle(const ComputedStyle& parent_style,
+                                      ComputedStyle& inner_style) const {
   inner_style.SetFlexGrow(1);
   inner_style.SetFlexShrink(1);
   // min-width: 0; is needed for correct shrinking.
@@ -80,8 +138,8 @@ void MenuListInnerElement::AdjustInnerStyle(const ComputedStyle& parent_style,
   LayoutTheme& theme = LayoutTheme::GetTheme();
   Length padding_start =
       Length::Fixed(theme.PopupInternalPaddingStart(parent_style));
-  Length padding_end = Length::Fixed(
-      theme.PopupInternalPaddingEnd(GetDocument().GetFrame(), parent_style));
+  Length padding_end =
+      Length::Fixed(theme.PopupInternalPaddingEnd(GetFrame(), parent_style));
   if (parent_style.IsLeftToRightDirection()) {
     inner_style.SetTextAlign(ETextAlign::kLeft);
     inner_style.SetPaddingLeft(padding_start);
@@ -96,8 +154,10 @@ void MenuListInnerElement::AdjustInnerStyle(const ComputedStyle& parent_style,
   inner_style.SetPaddingBottom(
       Length::Fixed(theme.PopupInternalPaddingBottom(parent_style)));
 
-  if (const ComputedStyle* option_style =
-          To<HTMLSelectElement>(OwnerShadowHost())->OptionStyle()) {
+  if (HasOptionStyleChanged(inner_style)) {
+    inner_block_->SetNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
+        layout_invalidation_reason::kStyleChange);
+    const ComputedStyle* option_style = SelectElement()->OptionStyle();
     inner_style.SetDirection(option_style->Direction());
     inner_style.SetUnicodeBidi(option_style->GetUnicodeBidi());
   }
@@ -108,7 +168,41 @@ HTMLSelectElement* LayoutMenuList::SelectElement() const {
 }
 
 LayoutBlock* LayoutMenuList::InnerBlock() const {
-  return To<LayoutBlock>(SelectElement()->InnerElement().GetLayoutObject());
+  return inner_block_;
+}
+
+void LayoutMenuList::AddChild(LayoutObject* new_child,
+                              LayoutObject* before_child) {
+  inner_block_->AddChild(new_child, before_child);
+  DCHECK_EQ(inner_block_, FirstChild());
+
+  if (AXObjectCache* cache = GetDocument().ExistingAXObjectCache())
+    cache->ChildrenChanged(this);
+
+  // LayoutMenuList::ControlClipRect() depends on inner_block_->ContentsSize().
+  SetNeedsPaintPropertyUpdate();
+  if (Layer())
+    Layer()->SetNeedsCompositingInputsUpdate();
+}
+
+void LayoutMenuList::RemoveChild(LayoutObject* old_child) {
+  if (old_child == inner_block_ || !inner_block_) {
+    LayoutFlexibleBox::RemoveChild(old_child);
+    inner_block_ = nullptr;
+  } else {
+    inner_block_->RemoveChild(old_child);
+  }
+}
+
+void LayoutMenuList::StyleDidChange(StyleDifference diff,
+                                    const ComputedStyle* old_style) {
+  LayoutBlock::StyleDidChange(diff, old_style);
+
+  if (!inner_block_)
+    CreateInnerBlock();
+
+  button_text_->SetStyle(Style());
+  UpdateInnerStyle();
 }
 
 void LayoutMenuList::UpdateOptionsWidth() const {
@@ -133,8 +227,22 @@ void LayoutMenuList::UpdateOptionsWidth() const {
   options_width_ = static_cast<int>(ceilf(max_option_width));
 }
 
+void LayoutMenuList::UpdateFromElement() {
+  DCHECK(inner_block_);
+  if (HasOptionStyleChanged(inner_block_->StyleRef()))
+    UpdateInnerStyle();
+}
+
+void LayoutMenuList::SetText(const String& s) {
+  button_text_->ForceSetText(s.Impl());
+  // LayoutMenuList::ControlClipRect() depends on inner_block_->ContentsSize().
+  SetNeedsPaintPropertyUpdate();
+  if (Layer())
+    Layer()->SetNeedsCompositingInputsUpdate();
+}
+
 String LayoutMenuList::GetText() const {
-  return SelectElement()->InnerElement().innerText();
+  return button_text_ ? button_text_->GetText() : String();
 }
 
 PhysicalRect LayoutMenuList::ControlClipRect(

third_party/blink/renderer/core/layout/layout_menu_list.h

@@ -27,10 +27,12 @@
 
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/layout/layout_flexible_box.h"
+#include "third_party/blink/renderer/platform/geometry/layout_rect.h"
 
 namespace blink {
 
 class HTMLSelectElement;
+class LayoutText;
 
 class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox {
  public:
@@ -39,6 +41,7 @@ class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox {
 
   HTMLSelectElement* SelectElement() const;
   String GetText() const;
+  void SetText(const String&);
 
   const char* GetName() const override { return "LayoutMenuList"; }
 
@@ -51,6 +54,13 @@ class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox {
   }
   bool IsChildAllowed(LayoutObject*, const ComputedStyle&) const override;
 
+  void AddChild(LayoutObject* new_child,
+                LayoutObject* before_child = nullptr) override;
+  void RemoveChild(LayoutObject*) override;
+  bool CreatesAnonymousWrapper() const override { return true; }
+
+  void UpdateFromElement() override;
+
   PhysicalRect ControlClipRect(const PhysicalOffset&) const override;
   bool HasControlClip() const override { return true; }
 
@@ -61,8 +71,20 @@ class CORE_EXPORT LayoutMenuList final : public LayoutFlexibleBox {
                             LayoutUnit logical_top,
                             LogicalExtentComputedValues&) const override;
 
+  void StyleDidChange(StyleDifference, const ComputedStyle* old_style) override;
+
   LayoutBlock* InnerBlock() const;
+  void CreateInnerBlock();
+  scoped_refptr<ComputedStyle> CreateInnerStyle();
+  void UpdateInnerStyle();
+  void AdjustInnerStyle(const ComputedStyle& parent_style,
+                        ComputedStyle& inner_style) const;
+  bool HasOptionStyleChanged(const ComputedStyle& inner_style) const;
   void UpdateOptionsWidth() const;
+  void SetIndexToSelectOnCancel(int list_index);
+
+  LayoutText* button_text_;
+  LayoutBlock* inner_block_;
 
   // m_optionsWidth is calculated and cached on demand.
   // updateOptionsWidth() should be called before reading them.

third_party/blink/renderer/modules/BUILD.gn

@@ -252,7 +252,6 @@ jumbo_source_set("unit_tests") {
 
   sources = [
     "accessibility/accessibility_object_model_test.cc",
-    "accessibility/ax_layout_object_test.cc",
     "accessibility/ax_object_cache_test.cc",
     "accessibility/ax_object_test.cc",
     "accessibility/ax_position_test.cc",

third_party/blink/renderer/modules/accessibility/ax_layout_object_test.cc

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/blink/renderer/modules/accessibility/ax_layout_object.h"
-
-#include "third_party/blink/renderer/modules/accessibility/testing/accessibility_test.h"
-
-namespace blink {
-
-class AXLayoutObjectTest : public test::AccessibilityTest {};
-
-TEST_F(AXLayoutObjectTest, StringValueTextTransform) {
-  SetBodyInnerHTML(
-      "<select id='t' style='text-transform:uppercase'>"
-      "<option>abc</select>");
-  const AXObject* ax_select = GetAXObjectByElementId("t");
-  ASSERT_NE(nullptr, ax_select);
-  EXPECT_TRUE(ax_select->IsAXLayoutObject());
-  EXPECT_EQ("ABC", ax_select->StringValue());
-}
-
-TEST_F(AXLayoutObjectTest, StringValueTextSecurity) {
-  SetBodyInnerHTML(
-      "<select id='t' style='-webkit-text-security:disc'>"
-      "<option>abc</select>");
-  const AXObject* ax_select = GetAXObjectByElementId("t");
-  ASSERT_NE(nullptr, ax_select);
-  EXPECT_TRUE(ax_select->IsAXLayoutObject());
-  // U+2022 -> \xE2\x80\xA2 in UTF-8
-  EXPECT_EQ("\xE2\x80\xA2\xE2\x80\xA2\xE2\x80\xA2",
-            ax_select->StringValue().Utf8());
-}
-
-}  // namespace blink

third_party/blink/web_tests/accessibility/notification-listeners.html

@@ -22,6 +22,9 @@ async_test((t) => {
       ["Blur", new Map([
         ["select", 1],
       ])],
+      ["TextChanged", new Map([
+        ["select", 2],
+      ])],
       ["InvalidStatusChanged", new Map([
         ["select", 1],
       ])],
@@ -38,6 +41,9 @@ async_test((t) => {
       ["Blur", new Map([
         ["AXRole: AXPopUpButton", 1],
       ])],
+      ["TextChanged", new Map([
+        ["AXRole: AXPopUpButton", 2],
+      ])],
       ["InvalidStatusChanged", new Map([
         ["AXRole: AXPopUpButton", 1],
       ])],
@@ -98,9 +104,9 @@ async_test((t) => {
       }
       if (expected_element_notifications.size == 0 &&
         expected_global_notifications.size === 0) {
-        assert_equals(selectNotificationCount, 3);
+        assert_equals(selectNotificationCount, 5);
         assert_equals(sliderNotificationCount, 2);
-        assert_equals(globalNotificationCount, 5);
+        assert_equals(globalNotificationCount, 7);
         accessibilityController.removeNotificationListener();
         select.removeNotificationListener();
         slider.removeNotificationListener();

third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 31x20
   LayoutBlockFlow (positioned) {DIV} at (8,50) size 31x20
     LayoutMenuList {SELECT} at (0,0) size 31x20 [bgcolor=#DDDDDD] [border: (1px solid #767676)]
-      LayoutBlockFlow {DIV} at (1,1) size 29x18
-        LayoutText {#text} at (4,1) size 9x16
+      LayoutBlockFlow (anonymous) at (1,1) size 29x18
+        LayoutText (anonymous) at (4,1) size 9x16
           text run at (4,1) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/inspector-protocol/dom-snapshot/dom-snapshot-getSnapshot-input-value-expected.txt

@@ -116,7 +116,6 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "childNodeIndexes": [
         9
       ],
-      "layoutNodeIndex": 5,
       "shadowRootType": "user-agent"
     },
     {
@@ -124,7 +123,6 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "Option 1",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 6,
       "shadowRootType": "user-agent"
     },
     {
@@ -195,7 +193,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 7
+      "layoutNodeIndex": 5
     },
     {
       "nodeType": 1,
@@ -216,7 +214,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": "InputValue"
         }
       ],
-      "layoutNodeIndex": 8,
+      "layoutNodeIndex": 6,
       "isClickable": true
     },
     {
@@ -227,7 +225,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "childNodeIndexes": [
         18
       ],
-      "layoutNodeIndex": 9,
+      "layoutNodeIndex": 7,
       "shadowRootType": "user-agent",
       "isClickable": true
     },
@@ -236,7 +234,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "InputValue",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 10,
+      "layoutNodeIndex": 8,
       "shadowRootType": "user-agent",
       "isClickable": true
     },
@@ -245,7 +243,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 11
+      "layoutNodeIndex": 9
     },
     {
       "nodeType": 1,
@@ -270,7 +268,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": "ButtonValue"
         }
       ],
-      "layoutNodeIndex": 12,
+      "layoutNodeIndex": 10,
       "isClickable": true
     },
     {
@@ -278,7 +276,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "ButtonValue",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 13,
+      "layoutNodeIndex": 11,
       "shadowRootType": "user-agent"
     },
     {
@@ -286,7 +284,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 14
+      "layoutNodeIndex": 12
     },
     {
       "nodeType": 1,
@@ -313,7 +311,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": ""
         }
       ],
-      "layoutNodeIndex": 15,
+      "layoutNodeIndex": 13,
       "isClickable": true
     },
     {
@@ -321,7 +319,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 16
+      "layoutNodeIndex": 14
     },
     {
       "nodeType": 1,
@@ -340,7 +338,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": "radio"
         }
       ],
-      "layoutNodeIndex": 17,
+      "layoutNodeIndex": 15,
       "isClickable": true
     },
     {
@@ -348,7 +346,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 18
+      "layoutNodeIndex": 16
     },
     {
       "nodeType": 1,
@@ -375,7 +373,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": ""
         }
       ],
-      "layoutNodeIndex": 19,
+      "layoutNodeIndex": 17,
       "isClickable": true
     },
     {
@@ -383,7 +381,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 20
+      "layoutNodeIndex": 18
     },
     {
       "nodeType": 1,
@@ -406,7 +404,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": ""
         }
       ],
-      "layoutNodeIndex": 21,
+      "layoutNodeIndex": 19,
       "isClickable": true
     },
     {
@@ -414,7 +412,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n  ",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 22
+      "layoutNodeIndex": 20
     },
     {
       "nodeType": 1,
@@ -431,7 +429,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
           "value": "TextArea"
         }
       ],
-      "layoutNodeIndex": 23
+      "layoutNodeIndex": 21
     },
     {
       "nodeType": 1,
@@ -441,7 +439,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "childNodeIndexes": [
         33
       ],
-      "layoutNodeIndex": 24,
+      "layoutNodeIndex": 22,
       "shadowRootType": "user-agent",
       "isClickable": true
     },
@@ -450,7 +448,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "TextAreaValue",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 25,
+      "layoutNodeIndex": 23,
       "shadowRootType": "user-agent",
       "isClickable": true
     },
@@ -459,7 +457,7 @@ Tests DOMSnapshot.getSnapshot method returning input values.
       "nodeName": "#text",
       "nodeValue": "\n",
       "backendNodeId": "<number>",
-      "layoutNodeIndex": 26
+      "layoutNodeIndex": 24
     },
     {
       "nodeType": 3,

third_party/blink/web_tests/platform/linux/editing/selection/replaced-boundaries-3-expected.txt

@@ -16,8 +16,8 @@ layer at (0,0) size 800x600
           text run at (0,0) width 22: "abc"
         LayoutBR {BR} at (22,15) size 0x0
         LayoutMenuList {SELECT} at (0,20) size 233x20 [bgcolor=#DDDDDD] [border: (1px solid #767676)]
-          LayoutBlockFlow {DIV} at (1,1) size 231x18
-            LayoutText {#text} at (4,1) size 211x16
+          LayoutBlockFlow (anonymous) at (1,1) size 231x18
+            LayoutText (anonymous) at (4,1) size 211x16
               text run at (4,1) width 211: "this select box shouldn't be selected"
         LayoutText {#text} at (0,0) size 0x0
 selection start: position 1 of child 0 {#text} of child 3 {DIV} of body

third_party/blink/web_tests/platform/linux/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 31x20
   LayoutNGBlockFlow (positioned) {DIV} at (8,50) size 31x20
     LayoutMenuList {SELECT} at (0,0) size 31x20 [bgcolor=#DDDDDD] [border: (1px solid #767676)]
-      LayoutBlockFlow {DIV} at (1,1) size 29x18
-        LayoutText {#text} at (4,1) size 9x16
+      LayoutBlockFlow (anonymous) at (1,1) size 29x18
+        LayoutText (anonymous) at (4,1) size 9x16
           text run at (4,1) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/platform/linux/virtual/form-controls-refresh-disabled/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 31x20
   LayoutNGBlockFlow (positioned) {DIV} at (8,50) size 31x20
     LayoutMenuList {SELECT} at (0,0) size 31x20 [bgcolor=#DDDDDD] [border: (1px solid #A9A9A9)]
-      LayoutBlockFlow {DIV} at (1,1) size 29x18
-        LayoutText {#text} at (4,1) size 9x16
+      LayoutBlockFlow (anonymous) at (1,1) size 29x18
+        LayoutText (anonymous) at (4,1) size 9x16
           text run at (4,1) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/platform/mac-mac10.10/editing/selection/replaced-boundaries-3-expected.txt

@@ -16,8 +16,8 @@ layer at (0,0) size 800x600
           text run at (0,0) width 23: "abc"
         LayoutBR {BR} at (22,14) size 1x0
         LayoutMenuList {SELECT} at (0,18) size 215x18 [bgcolor=#F8F8F8]
-          LayoutBlockFlow {DIV} at (0,0) size 215x18
-            LayoutText {#text} at (8,2) size 184x13
+          LayoutBlockFlow (anonymous) at (0,0) size 215x18
+            LayoutText (anonymous) at (8,2) size 184x13
               text run at (8,2) width 184: "this select box shouldn't be selected"
         LayoutText {#text} at (0,0) size 0x0
 selection start: position 1 of child 0 {#text} of child 3 {DIV} of body

third_party/blink/web_tests/platform/mac-mac10.10/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 40x18
   LayoutBlockFlow (positioned) {DIV} at (8,50) size 40x18
     LayoutMenuList {SELECT} at (0,0) size 40x18 [bgcolor=#F8F8F8]
-      LayoutBlockFlow {DIV} at (0,0) size 40x18
-        LayoutText {#text} at (8,2) size 9x13
+      LayoutBlockFlow (anonymous) at (0,0) size 40x18
+        LayoutText (anonymous) at (8,2) size 9x13
           text run at (8,2) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/platform/mac/editing/selection/replaced-boundaries-3-expected.txt

@@ -16,8 +16,8 @@ layer at (0,0) size 800x600
           text run at (0,0) width 23: "abc"
         LayoutBR {BR} at (22,14) size 1x0
         LayoutMenuList {SELECT} at (0,18) size 224x18 [bgcolor=#F8F8F8]
-          LayoutBlockFlow {DIV} at (0,0) size 224x18
-            LayoutText {#text} at (8,2) size 193x13
+          LayoutBlockFlow (anonymous) at (0,0) size 224x18
+            LayoutText (anonymous) at (8,2) size 193x13
               text run at (8,2) width 193: "this select box shouldn't be selected"
         LayoutText {#text} at (0,0) size 0x0
 selection start: position 1 of child 0 {#text} of child 3 {DIV} of body

third_party/blink/web_tests/platform/mac/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 39x18
   LayoutBlockFlow (positioned) {DIV} at (8,50) size 39x18
     LayoutMenuList {SELECT} at (0,0) size 39x18 [bgcolor=#F8F8F8]
-      LayoutBlockFlow {DIV} at (0,0) size 39x18
-        LayoutText {#text} at (8,2) size 8x13
+      LayoutBlockFlow (anonymous) at (0,0) size 39x18
+        LayoutText (anonymous) at (8,2) size 8x13
           text run at (8,2) width 8: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/platform/win/editing/selection/replaced-boundaries-3-expected.txt

@@ -17,8 +17,8 @@ layer at (0,0) size 800x600
           text run at (0,0) width 22: "abc"
         LayoutBR {BR} at (22,15) size 0x0
         LayoutMenuList {SELECT} at (0,20) size 235x20 [bgcolor=#FFFFFF] [border: (1px solid #767676)]
-          LayoutBlockFlow {DIV} at (1,1) size 233x18
-            LayoutText {#text} at (4,1) size 211x16
+          LayoutBlockFlow (anonymous) at (1,1) size 233x18
+            LayoutText (anonymous) at (4,1) size 211x16
               text run at (4,1) width 211: "this select box shouldn't be selected"
         LayoutText {#text} at (0,0) size 0x0
 selection start: position 1 of child 0 {#text} of child 3 {DIV} of body

third_party/blink/web_tests/platform/win/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 33x20
   LayoutNGBlockFlow (positioned) {DIV} at (8,50) size 33x20
     LayoutMenuList {SELECT} at (0,0) size 33x20 [bgcolor=#FFFFFF] [border: (1px solid #767676)]
-      LayoutBlockFlow {DIV} at (1,1) size 31x18
-        LayoutText {#text} at (4,1) size 9x16
+      LayoutBlockFlow (anonymous) at (1,1) size 31x18
+        LayoutText (anonymous) at (4,1) size 9x16
           text run at (4,1) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0
 

third_party/blink/web_tests/platform/win/virtual/form-controls-refresh-disabled/fast/forms/select/menulist-update-text-popup-expected.txt

@@ -7,8 +7,8 @@ C
 layer at (0,0) size 33x20
   LayoutNGBlockFlow (positioned) {DIV} at (8,50) size 33x20
     LayoutMenuList {SELECT} at (0,0) size 33x20 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)]
-      LayoutBlockFlow {DIV} at (1,1) size 31x18
-        LayoutText {#text} at (4,1) size 9x16
+      LayoutBlockFlow (anonymous) at (1,1) size 31x18
+        LayoutText (anonymous) at (4,1) size 9x16
           text run at (4,1) width 9: "C"
     LayoutText {#text} at (0,0) size 0x0