Revert "[block-in-inline] Change the runtime flag to stable" This reverts commit 4a76c96d2a4021257e691058c1fe1fb60d9d8327. Reason for revert: crbug.com/1306628 The plan is to disable in M100 but enable in M101. To do this, disable at trunk, then merge it to M100 and re-enable only in trunk. `WallpaperSubpageBrowserTest.LoadsCollectionsGrid` was temporarily disabled as it relies on LayoutNGBlockInInline (see `offsetHeight` in the "Known Behavior Changes" section of the design doc.) Original change's description: > [block-in-inline] Change the runtime flag to stable > > Includes rebaselines of known changes that were not enabled > when the flag was changed to "test" in r961524 > crrev.com/c/2956771. Please see the "Known Behavior Changes" > section of the design doc: > https://docs.google.com/document/d/15kgdIHhb9EVNup6Ir5NWwJxpzY5GH0ED7Ld3iMW3HlA/edit?pli=1#bookmark=id.a9j03i2hzxxf > > Bug: 716930 > Change-Id: Ic8d9134c592ebb8e88efc16aa636aed32a975ffc > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3398315 > Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org> > Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> > Reviewed-by: Morten Stenshorne <mstensho@chromium.org> > Commit-Queue: Koji Ishii <kojii@chromium.org> > Cr-Commit-Position: refs/heads/main@{#967823} Bug: 1306628, 716930 Change-Id: I7a87831361c5bac6f23b609ef29a4ab0b1345806 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3526799 Reviewed-by: Kent Tamura <tkent@chromium.org> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> Reviewed-by: Morten Stenshorne <mstensho@chromium.org> Reviewed-by: Jeffrey Young <cowmoo@chromium.org> Commit-Queue: Koji Ishii <kojii@chromium.org> Cr-Commit-Position: refs/heads/main@{#981678}
diff --git a/ash/webui/personalization_app/test/personalization_app_browsertest.js b/ash/webui/personalization_app/test/personalization_app_browsertest.js index caef8d9..27d3b272 100644 --- a/ash/webui/personalization_app/test/personalization_app_browsertest.js +++ b/ash/webui/personalization_app/test/personalization_app_browsertest.js
@@ -167,7 +167,9 @@ testDone(); }); -TEST_F('WallpaperSubpageBrowserTest', 'LoadsCollectionsGrid', () => { +// TODO(crbug.com/1306628): Disable this test while LayoutNGBlockInInline is +// off. This should be reenabled before the M101 branch point. +TEST_F('WallpaperSubpageBrowserTest', 'DISABLED_LoadsCollectionsGrid', () => { const router = document.querySelector('personalization-router'); assertTrue(!!router, 'personalization-router should be top level element');
diff --git a/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-auralinux.txt b/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-auralinux.txt index 552c40d1f2..0a6872f 100644 --- a/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-auralinux.txt +++ b/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-auralinux.txt
@@ -1,22 +1,21 @@ [document web] +++[separator] name='Control: elements that are not in tree' horizontal ++[section] -++++[separator] name='Control: elements that are not in tree' horizontal ++++[section] ++++++[section] -++++++++[section] -++++++++++[entry] selectable-text -++++[separator] name='An aria-owned element is always in tree' horizontal -++++[panel] -++++++[push button] name='button-in-owned-tree' -++++[separator] name='Element with aria-owns is always in tree' horizontal +++++++++[entry] selectable-text +++[separator] name='An aria-owned element is always in tree' horizontal +++[panel] +++++[push button] name='button-in-owned-tree' +++[separator] name='Element with aria-owns is always in tree' horizontal +++[section] +++++[entry] selectable-text +++[separator] name='Owning an element with unincluded ancestors serializes cleanly' horizontal +++[panel] +++++[check box] checkable:true +++[separator] name='All the above in one' horizontal +++[section] ++++[section] -++++++[entry] selectable-text -++++[separator] name='Owning an element with unincluded ancestors serializes cleanly' horizontal -++++[panel] -++++++[check box] checkable:true -++++[separator] name='All the above in one' horizontal +++++++[static] name='xyz' ++++[section] -++++++[section] -++++++++[static] name='xyz' -++++++[section] -++++++++[slider] horizontal current=50.000000 minimum=0.000000 maximum=100.000000 +++++++[slider] horizontal current=50.000000 minimum=0.000000 maximum=100.000000
diff --git a/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-blink.txt b/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-blink.txt index a768635..86297cd 100644 --- a/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-blink.txt +++ b/content/test/data/accessibility/aria/aria-owns-included-in-tree-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea ++genericContainer ignored -++++genericContainer +++++genericContainer ignored ++++++genericContainer ignored ++++++++splitter horizontal name='Control: elements that are not in tree' ++++++++genericContainer ignored
diff --git a/content/test/data/accessibility/aria/label-with-selected-option-expected-blink.txt b/content/test/data/accessibility/aria/label-with-selected-option-expected-blink.txt index 170e69f..f24d099 100644 --- a/content/test/data/accessibility/aria/label-with-selected-option-expected-blink.txt +++ b/content/test/data/accessibility/aria/label-with-selected-option-expected-blink.txt
@@ -1,7 +1,7 @@ rootWebArea ++genericContainer ignored ++++genericContainer ignored -++++++genericContainer +++++++genericContainer ignored ++++++++checkBox name='Test 1: Flash the screen 2 times.' checkedState=false ++++++++labelText ++++++++++staticText name='Test 1: Flash the screen' @@ -18,7 +18,7 @@ ++++++++++++++++inlineTextBox name='3' ++++++++++staticText name='times.' ++++++++++++inlineTextBox name='times.' -++++++genericContainer +++++++genericContainer ignored ++++++++checkBox name='Test 2: Flash the screen 2 times.' checkedState=false ++++++++labelText ++++++++++staticText name='Test 2: Flash the screen' @@ -37,7 +37,7 @@ ++++++++++++++++++inlineTextBox name='3' ++++++++++staticText name='times.' ++++++++++++inlineTextBox name='times.' -++++++genericContainer +++++++genericContainer ignored ++++++++checkBox name='Test 3: Flash the screen two times.' checkedState=false ++++++++labelText ++++++++++staticText name='Test 3: Flash the screen' @@ -54,7 +54,7 @@ ++++++++++++++++inlineTextBox name='3' ++++++++++staticText name='times.' ++++++++++++inlineTextBox name='times.' -++++++genericContainer +++++++genericContainer ignored ++++++++checkBox name='Test 4: Flash the screen two times.' checkedState=false ++++++++labelText ++++++++++staticText name='Test 4: Flash the screen' @@ -73,7 +73,7 @@ ++++++++++++++++++inlineTextBox name='3' ++++++++++staticText name='times.' ++++++++++++inlineTextBox name='times.' -++++++genericContainer +++++++genericContainer ignored ++++++++checkBox name='Test 5: Flash the screen two times.' checkedState=false ++++++++labelText ++++++++++staticText name='Test 5: Flash the screen'
diff --git a/content/test/data/accessibility/css/before-after-block-expected-blink.txt b/content/test/data/accessibility/css/before-after-block-expected-blink.txt index 8cb1b0a2..344d34c 100644 --- a/content/test/data/accessibility/css/before-after-block-expected-blink.txt +++ b/content/test/data/accessibility/css/before-after-block-expected-blink.txt
@@ -1,7 +1,7 @@ rootWebArea htmlTag='#document' ++genericContainer ignored htmlTag='html' ++++genericContainer ignored htmlTag='body' -++++++genericContainer htmlTag='div' +++++++genericContainer ignored htmlTag='div' ++++++++staticText name='A' ++++++++++inlineTextBox name='A' ++++++++genericContainer ignored htmlTag='b'
diff --git a/content/test/data/accessibility/css/before-after-code-expected-android-external.txt b/content/test/data/accessibility/css/before-after-code-expected-android-external.txt index f1ca5d2f..0906446 100644 --- a/content/test/data/accessibility/css/before-after-code-expected-android-external.txt +++ b/content/test/data/accessibility/css/before-after-code-expected-android-external.txt
@@ -1,4 +1,24 @@ WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] ++TextView text:"start" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"text with [:before] and [:after] content, then abold element with a [block] before content then a italicelement with a [block] after content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] +++TextView text:"text with " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"[" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:":before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"]" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:" and " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"[" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:":after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"]" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:" content, then a" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"bold" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:" element with a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"[" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"block" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"]" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:" before content then a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"italic" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"element with a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"[" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"block" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:"]" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++TextView text:" after content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] ++TextView text:"end" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file
diff --git a/content/test/data/accessibility/html/a-nested-structure-expected-android-external.txt b/content/test/data/accessibility/html/a-nested-structure-expected-android-external.txt index 6d58949..b7d1548 100644 --- a/content/test/data/accessibility/html/a-nested-structure-expected-android-external.txt +++ b/content/test/data/accessibility/html/a-nested-structure-expected-android-external.txt
@@ -1,14 +1,13 @@ WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"null" contentDescription:"Header 1 List element 1 List element 2 List element 3" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="http://www.foobar.com/"] -++++++TextView text:"Header 1" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", clickableScore="100", roleDescription="heading 1"] -++++++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list", clickableScore="100"] -++++++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] -++++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] -++++++++++TextView text:"List element 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] -++++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] -++++++++++TextView text:"List element 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] -++++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] -++++++++++TextView text:"List element 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file +++View text:"null" contentDescription:"Header 1 List element 1 List element 2 List element 3" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="http://www.foobar.com/"] +++++TextView text:"Header 1" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", clickableScore="100", roleDescription="heading 1"] +++++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list", clickableScore="100"] +++++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] +++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] +++++++++TextView text:"List element 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] +++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] +++++++++TextView text:"List element 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] +++++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] +++++++++TextView text:"List element 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file
diff --git a/content/test/data/accessibility/html/a-nested-structure-expected-android.txt b/content/test/data/accessibility/html/a-nested-structure-expected-android.txt index 1d08501..fac36600 100644 --- a/content/test/data/accessibility/html/a-nested-structure-expected-android.txt +++ b/content/test/data/accessibility/html/a-nested-structure-expected-android.txt
@@ -1,14 +1,13 @@ android.webkit.WebView focusable focused scrollable -++android.view.View -++++android.view.View role_description='link' clickable focusable link name='Header 1 List element 1 List element 2 List element 3' -++++++android.widget.TextView role_description='heading 1' heading name='Header 1' -++++++android.widget.ListView collection item_count=3 row_count=3 -++++++++android.view.View collection_item -++++++++++android.view.View name='%E2%80%A2 ' -++++++++++android.widget.TextView name='List element 1' -++++++++android.view.View collection_item item_index=1 row_index=1 -++++++++++android.view.View name='%E2%80%A2 ' -++++++++++android.widget.TextView name='List element 2' -++++++++android.view.View collection_item item_index=2 row_index=2 -++++++++++android.view.View name='%E2%80%A2 ' -++++++++++android.widget.TextView name='List element 3' \ No newline at end of file +++android.view.View role_description='link' clickable focusable link name='Header 1 List element 1 List element 2 List element 3' +++++android.widget.TextView role_description='heading 1' heading name='Header 1' +++++android.widget.ListView collection item_count=3 row_count=3 +++++++android.view.View collection_item +++++++++android.view.View name='%E2%80%A2 ' +++++++++android.widget.TextView name='List element 1' +++++++android.view.View collection_item item_index=1 row_index=1 +++++++++android.view.View name='%E2%80%A2 ' +++++++++android.widget.TextView name='List element 2' +++++++android.view.View collection_item item_index=2 row_index=2 +++++++++android.view.View name='%E2%80%A2 ' +++++++++android.widget.TextView name='List element 3' \ No newline at end of file
diff --git a/content/test/data/accessibility/html/a-nested-structure-expected-auralinux.txt b/content/test/data/accessibility/html/a-nested-structure-expected-auralinux.txt index 2bb42c14..b34baeb3 100644 --- a/content/test/data/accessibility/html/a-nested-structure-expected-auralinux.txt +++ b/content/test/data/accessibility/html/a-nested-structure-expected-auralinux.txt
@@ -1,15 +1,14 @@ [document web] -++[section] -++++[link] name='Header 1 List element 1 List element 2 List element 3' -++++++[heading] name='Header 1' -++++++++[static] name='Header 1' -++++++[list] -++++++++[list item] -++++++++++[static] name='%E2%80%A2 ' -++++++++++[static] name='List element 1' -++++++++[list item] -++++++++++[static] name='%E2%80%A2 ' -++++++++++[static] name='List element 2' -++++++++[list item] -++++++++++[static] name='%E2%80%A2 ' -++++++++++[static] name='List element 3' \ No newline at end of file +++[link] name='Header 1 List element 1 List element 2 List element 3' +++++[heading] name='Header 1' +++++++[static] name='Header 1' +++++[list] +++++++[list item] +++++++++[static] name='%E2%80%A2 ' +++++++++[static] name='List element 1' +++++++[list item] +++++++++[static] name='%E2%80%A2 ' +++++++++[static] name='List element 2' +++++++[list item] +++++++++[static] name='%E2%80%A2 ' +++++++++[static] name='List element 3' \ No newline at end of file
diff --git a/content/test/data/accessibility/html/a-nested-structure-expected-blink.txt b/content/test/data/accessibility/html/a-nested-structure-expected-blink.txt index 579028a..163ea5e 100644 --- a/content/test/data/accessibility/html/a-nested-structure-expected-blink.txt +++ b/content/test/data/accessibility/html/a-nested-structure-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea ++genericContainer ignored -++++genericContainer +++++genericContainer ignored ++++++link name='Header 1 List element 1 List element 2 List element 3' ++++++++heading name='Header 1' hierarchicalLevel=1 ++++++++++staticText name='Header 1'
diff --git a/content/test/data/accessibility/html/continuations-expected-android-external.txt b/content/test/data/accessibility/html/continuations-expected-android-external.txt index 433091c..90be0588 100644 --- a/content/test/data/accessibility/html/continuations-expected-android-external.txt +++ b/content/test/data/accessibility/html/continuations-expected-android-external.txt
@@ -15,8 +15,7 @@ ++++++++TextView text:"After" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] ++View text:"Group 4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] ++++TextView text:"Before" viewIdResName:"before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"After" viewIdResName:"after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] +++++TextView text:"After" viewIdResName:"after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] ++View text:"Group 5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] ++++TextView text:"Italic only " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] ++++TextView text:"italic and bold" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"]
diff --git a/content/test/data/accessibility/html/continuations-expected-auralinux.txt b/content/test/data/accessibility/html/continuations-expected-auralinux.txt index 0e4e2cf3..23dcfc44 100644 --- a/content/test/data/accessibility/html/continuations-expected-auralinux.txt +++ b/content/test/data/accessibility/html/continuations-expected-auralinux.txt
@@ -21,9 +21,8 @@ ++[panel] name='Group 4' ++++[section] ++++++[static] name='Before' -++++[section] -++++++[paragraph] -++++++++[static] name='After' +++++[paragraph] +++++++[static] name='After' ++[panel] name='Group 5' ++++[static] name='Italic only ' ++++[static] name='italic and bold'
diff --git a/content/test/data/accessibility/html/continuations-expected-blink.txt b/content/test/data/accessibility/html/continuations-expected-blink.txt index af1441e..96dcbe8 100644 --- a/content/test/data/accessibility/html/continuations-expected-blink.txt +++ b/content/test/data/accessibility/html/continuations-expected-blink.txt
@@ -32,7 +32,7 @@ ++++++++genericContainer display='block' isLineBreakingObject=true ++++++++++staticText display='block' name='Before' ++++++++++++inlineTextBox display='block' name='Before' -++++++++genericContainer display='block' isLineBreakingObject=true +++++++++genericContainer ignored isLineBreakingObject=true ++++++++++paragraph display='block' isLineBreakingObject=true ++++++++++++staticText display='block' name='After' ++++++++++++++inlineTextBox display='block' name='After'
diff --git a/content/test/data/accessibility/html/continuations-parser-splits-markup-expected-blink.txt b/content/test/data/accessibility/html/continuations-parser-splits-markup-expected-blink.txt index 5f023da..6829cda 100644 --- a/content/test/data/accessibility/html/continuations-parser-splits-markup-expected-blink.txt +++ b/content/test/data/accessibility/html/continuations-parser-splits-markup-expected-blink.txt
@@ -1,7 +1,7 @@ rootWebArea isLineBreakingObject=true ++genericContainer ignored isLineBreakingObject=true ++++genericContainer ignored isLineBreakingObject=true -++++++genericContainer display='block' isLineBreakingObject=true +++++++genericContainer ignored isLineBreakingObject=true ++++++++genericContainer className='copied-element' display='inline' ++++++++++genericContainer className='before' display='block' isLineBreakingObject=true ++++++++++++staticText display='block' name='Before'
diff --git a/content/test/data/accessibility/html/custom-element-nested-slots-expected-auralinux.txt b/content/test/data/accessibility/html/custom-element-nested-slots-expected-auralinux.txt index 855e286f..f5af5c2 100644 --- a/content/test/data/accessibility/html/custom-element-nested-slots-expected-auralinux.txt +++ b/content/test/data/accessibility/html/custom-element-nested-slots-expected-auralinux.txt
@@ -1,4 +1,3 @@ [document web] tag:#document -++[section] tag:body -++++[paragraph] tag:p -++++++[static] name='Slot contents' \ No newline at end of file +++[paragraph] tag:p +++++[static] name='Slot contents'
diff --git a/content/test/data/accessibility/html/custom-element-nested-slots-expected-blink.txt b/content/test/data/accessibility/html/custom-element-nested-slots-expected-blink.txt index f094fb6..654c3422f 100644 --- a/content/test/data/accessibility/html/custom-element-nested-slots-expected-blink.txt +++ b/content/test/data/accessibility/html/custom-element-nested-slots-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea htmlTag='#document' ++genericContainer ignored htmlTag='html' -++++genericContainer htmlTag='body' +++++genericContainer ignored htmlTag='body' ++++++genericContainer ignored htmlTag='my-element' ++++++++genericContainer ignored className='div-inside-template' htmlTag='div' ++++++++++genericContainer ignored className='outer' htmlTag='slot'
diff --git a/content/test/data/accessibility/html/custom-element-remove-nodes-expected-blink.txt b/content/test/data/accessibility/html/custom-element-remove-nodes-expected-blink.txt index 4312912..80e69ed 100644 --- a/content/test/data/accessibility/html/custom-element-remove-nodes-expected-blink.txt +++ b/content/test/data/accessibility/html/custom-element-remove-nodes-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea htmlTag='#document' name='done' ++genericContainer ignored htmlTag='html' -++++genericContainer htmlTag='body' +++++genericContainer ignored htmlTag='body' ++++++genericContainer className='dt1' htmlTag='x-details' ++++++++genericContainer ignored htmlTag='slot' ++++++++++genericContainer description='Details' htmlTag='summary' descriptionFrom=summary
diff --git a/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-expected-blink.txt b/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-expected-blink.txt index 2251051..d22c1bf3 100644 --- a/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-expected-blink.txt +++ b/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea ++genericContainer ignored -++++genericContainer +++++genericContainer ignored ++++++group ++++++++docEndnotes ++++++++++docEndnote
diff --git a/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-slot-expected-blink.txt b/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-slot-expected-blink.txt index 9a776199..0e70391a 100644 --- a/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-slot-expected-blink.txt +++ b/content/test/data/accessibility/html/custom-element-with-aria-owns-inside-slot-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea ++genericContainer ignored -++++genericContainer +++++genericContainer ignored ++++++group ++++++++docEndnotes ++++++++++docEndnote
diff --git a/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt b/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt index 8e046a3..5a3cb517 100644 --- a/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt +++ b/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt
@@ -1,11 +1,10 @@ WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++++++TextView text:"Headings are allowed in a map" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++++++View text:"null" contentDescription:"pipe1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/fake.htm"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++++++TextView text:"So are " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View text:"other elements" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="mark", roleDescription="highlight"] -++++++++TextView text:"!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"pipe2" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText", clickableScore="200"] -++++++Button text:"Even a button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file +++Image text:"pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] +++++TextView text:"Headings are allowed in a map" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] +++++View text:"null" contentDescription:"pipe1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/fake.htm"] +++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] +++++++TextView text:"So are " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++++View text:"other elements" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="mark", roleDescription="highlight"] +++++++TextView text:"!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++TextView text:"pipe2" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText", clickableScore="200"] +++++Button text:"Even a button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file
diff --git a/content/test/data/accessibility/html/map-any-contents-expected-auralinux.txt b/content/test/data/accessibility/html/map-any-contents-expected-auralinux.txt index 59d1f39d..a5de671 100644 --- a/content/test/data/accessibility/html/map-any-contents-expected-auralinux.txt +++ b/content/test/data/accessibility/html/map-any-contents-expected-auralinux.txt
@@ -1,13 +1,12 @@ [document web] -++[section] -++++[image map] name='pipe' -++++++[heading] name='Headings are allowed in a map' -++++++++[static] name='Headings are allowed in a map' -++++++[link] name='pipe1' -++++++[paragraph] -++++++++[static] name='So are ' -++++++++[static] -++++++++++[static] name='other elements' -++++++++[static] name='!' -++++++[static] name='pipe2' -++++++[push button] name='Even a button' \ No newline at end of file +++[image map] name='pipe' +++++[heading] name='Headings are allowed in a map' +++++++[static] name='Headings are allowed in a map' +++++[link] name='pipe1' +++++[paragraph] +++++++[static] name='So are ' +++++++[static] +++++++++[static] name='other elements' +++++++[static] name='!' +++++[static] name='pipe2' +++++[push button] name='Even a button' \ No newline at end of file
diff --git a/content/test/data/accessibility/html/map-any-contents-expected-blink.txt b/content/test/data/accessibility/html/map-any-contents-expected-blink.txt index f88a81d..b4d6e31 100644 --- a/content/test/data/accessibility/html/map-any-contents-expected-blink.txt +++ b/content/test/data/accessibility/html/map-any-contents-expected-blink.txt
@@ -1,6 +1,6 @@ rootWebArea ++genericContainer ignored -++++genericContainer +++++genericContainer ignored ++++++image name='pipe' ++++++++heading name='Headings are allowed in a map' ++++++++++staticText name='Headings are allowed in a map'
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc index e8c1c486..1cee901 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -146,10 +146,6 @@ const base::Feature kPath2DPaintCache{"Path2DPaintCache", base::FEATURE_DISABLED_BY_DEFAULT}; -// Enable by default. This feature is for a kill switch. -const base::Feature kLayoutNGBlockInInline{"LayoutNGBlockInInline", - base::FEATURE_ENABLED_BY_DEFAULT}; - const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h index 16aa2edf..5dd9fd0 100644 --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h
@@ -50,7 +50,6 @@ BLINK_COMMON_EXPORT extern const base::Feature kDeferredFontShaping; BLINK_COMMON_EXPORT extern const base::Feature kEditingNG; BLINK_COMMON_EXPORT extern const base::Feature kLayoutNG; -BLINK_COMMON_EXPORT extern const base::Feature kLayoutNGBlockInInline; BLINK_COMMON_EXPORT extern const base::Feature kMixedContentAutoupgrade; BLINK_COMMON_EXPORT extern const base::Feature kNavigationPredictor; BLINK_COMMON_EXPORT extern const base::Feature kAnchorElementInteraction;
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 763498f5..8dc8751 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1329,7 +1329,7 @@ { name: "LayoutNGBlockInInline", depends_on: ["LayoutNG"], - status: "stable", + status: "test", }, { // Block fragmentation support in the flex layout algorithm.