Include raw view elements in UI Automation tree dumps

While working on tuning which nodes we include in the UI Automation
control and content views, I discovered that our tree dumper was only
dumping nodes in the control view. This CL applies a filter to dump the
raw view, which is a superset of the control view, giving us dumps that
are more complete.

R=iapres@microsoft.com

Bug: 1028345
Change-Id: I98d53285abb77eb8490903f85a2c21e63e1f8c33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935027Reviewed-by: Ian Prest <iapres@microsoft.com>
Commit-Queue: Kevin Babbitt <kbabbitt@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#718915}

chrome/test/data/pdf/accessibility/overlapping-links-expected-uia-win.txt

@@ -3,7 +3,11 @@ group
 ++++region Name='Page 1'
 ++++++group
 ++++++++link Name='start first link start second link end second link end first link<newline>'
+++++++++++description Name='start first link start second link end second link end first link<newline>' IsControlElement=false
 ++++++group
 ++++++++link Name=' start second link end second link'
+++++++++++description Name=' start second link end second link' IsControlElement=false
 ++++++++link Name='START FIRST LINK START SECOND LINK END FIRST LINK'
+++++++++++description Name='START FIRST LINK START SECOND LINK END FIRST LINK' IsControlElement=false
 ++++++++link Name='START SECOND LINK END FIRST LINK END SECOND LINK'
+++++++++++description Name='START SECOND LINK END FIRST LINK END SECOND LINK' IsControlElement=false

chrome/test/data/pdf/accessibility/paragraphs-and-heading-untagged-expected-uia-win.txt

@@ -2,6 +2,7 @@ group
 ++document Name='PDF document containing 1 page'
 ++++region Name='Page 1'
 ++++++heading
+++++++++description Name='Heading<newline>' IsControlElement=false
 ++++++group
 ++++++++description Name='This is a small pdf file:<newline>'
 ++++++group

chrome/test/data/pdf/accessibility/text-image-link-expected-uia-win.txt

@@ -2,14 +2,19 @@ group
 ++document Name='PDF document containing 2 pages'
 ++++region Name='Page 1'
 ++++++heading
+++++++++description Name='Link Annotations - Page 1<newline>' IsControlElement=false
 ++++++heading
 ++++++++link Name='Link with destination to second page<newline>'
+++++++++++description Name='Link with destination to second page<newline>' IsControlElement=false
 ++++++group
 ++++++++link Name='PDF Reference, Version 1.7,'
+++++++++++description Name='PDF Reference, Version 1.7,' IsControlElement=false
 ++++++++description Name=' Section 8.4.5 defines Annotations<newline>3. Hello World<newline>'
 ++++++++link Name='https://pdfium.googlesource.com/pdfium'
+++++++++++description Name='https://pdfium.googlesource.com/pdfium' IsControlElement=false
 ++++++++description Name=' is link in plain text, not link annotation. These are referred to<newline>as '
 ++++++++link Name='WebLinks in PDFium'
+++++++++++description Name='WebLinks in PDFium' IsControlElement=false
 ++++++++description Name='.'
 ++++++++link
 ++++++++img Name='Image 1'

chrome/test/data/pdf/accessibility/weblinks-expected-uia-win.txt

@@ -4,11 +4,14 @@ group
 ++++++group
 ++++++++description Name='Hello, '
 ++++++++link Name='http://yahoo.com'
+++++++++++description Name='http://yahoo.com' IsControlElement=false
 ++++++++description Name='! nice meeting you<newline>'
 ++++++group
 ++++++++description Name='Goodbye, '
 ++++++++link Name='http://bing.com'
+++++++++++description Name='http://bing.com' IsControlElement=false
 ++++++++description Name='! nice meeting you<newline>'
 ++++++group
 ++++++++description Name='Bye, '
 ++++++++link Name='http://google.com'
+++++++++++description Name='http://google.com' IsControlElement=false

content/browser/accessibility/accessibility_tree_formatter_uia_win.cc

@@ -970,6 +970,12 @@ void AccessibilityTreeFormatterUia::BuildCacheRequests() {
   CHECK(children_cache_request_.Get());
   children_cache_request_->put_TreeScope(TreeScope_Children);
 
+  // Set filter to include all nodes in the raw view.
+  Microsoft::WRL::ComPtr<IUIAutomationCondition> raw_view_condition;
+  uia_->get_RawViewCondition(&raw_view_condition);
+  CHECK(raw_view_condition.Get());
+  children_cache_request_->put_TreeFilter(raw_view_condition.Get());
+
   // Create cache request for requesting information about a node.
   uia_->CreateCacheRequest(&element_cache_request_);
   CHECK(element_cache_request_.Get());

content/test/data/accessibility/aria/aria-button-expected-uia-win.txt

@@ -5,6 +5,7 @@ document
 ++menu Name='Button4' ExpandCollapse.ExpandCollapseState='Collapsed'
 ++button Name='Button5'
 ++button Name='Complex button '
+++++description Name='Complex button ' IsControlElement=false
 ++++textbox
 ++button Name='Complex toggle button ' Toggle.ToggleState='On'
 ++++description Name='Complex toggle button '

content/test/data/accessibility/aria/aria-tree-discontinuous-expected-uia-win.txt

 document PositionInSet=0 SizeOfSet=0
 ++tree PositionInSet=0 SizeOfSet=2 Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
 ++++treeitem Name='card content' PositionInSet=1 SizeOfSet=2 ExpandCollapse.ExpandCollapseState='LeafNode' SelectionItem.IsSelected=false
+++++++description Name='card content' IsControlElement=false PositionInSet=0 SizeOfSet=0
 ++++group PositionInSet=0 SizeOfSet=0
 ++++treeitem Name='card content' PositionInSet=2 SizeOfSet=2 ExpandCollapse.ExpandCollapseState='LeafNode' SelectionItem.IsSelected=false
+++++++description Name='card content' IsControlElement=false PositionInSet=0 SizeOfSet=0

content/test/data/accessibility/html/a-expected-uia-win.txt

 document
 ++group
 ++++link Name='normal link'
+++++++description Name='normal link' IsControlElement=false

content/test/data/accessibility/html/a-name-calc-expected-uia-win.txt

 document
 ++link Name='InnerText0'
+++++description Name='InnerText0' IsControlElement=false
 ++description Name=' '
 ++link Name='InnerText1' FullDescription='Title1'
+++++description Name='InnerText1' IsControlElement=false
 ++description Name=' '
 ++link Name='Title2'
+++++description Name='InnerText2' IsControlElement=false
 ++description Name=' '
 ++link Name='LabelledBy3'
+++++description Name='InnerText3' IsControlElement=false
 ++link Name='Title4'
 ++link Name='Label5'
 ++link Name='LabelledBy6'

content/test/data/accessibility/html/a-name-expected-uia-win.txt

@@ -2,3 +2,4 @@ document
 ++link Name='named anchor'
 ++++description Name='named anchor'
 ++link Name='both a named anchor and a link'
+++++description Name='both a named anchor and a link' IsControlElement=false

content/test/data/accessibility/html/a-onclick-expected-uia-win.txt

 document
 ++link Name='link with no href but onclick'
+++++description Name='link with no href but onclick' IsControlElement=false
 ++link Name='link with no href and click handler added via script'
+++++description Name='link with no href and click handler added via script' IsControlElement=false

content/test/data/accessibility/html/a-with-img-expected-uia-win.txt

@@ -2,12 +2,18 @@ document
 ++group
 ++++link Name='Link with image at start.'
 ++++++img Name='Link'
+++++++description Name=' with image at start.' IsControlElement=false
 ++++description Name=' '
 ++++link Name='Link with image in the middle.'
+++++++description Name='Link with ' IsControlElement=false
 ++++++img Name='image'
+++++++description Name=' in the middle.' IsControlElement=false
 ++++description Name=' '
 ++++link Name='Link with broken in the middle.'
+++++++description Name='Link with ' IsControlElement=false
 ++++++img Name='broken'
+++++++description Name=' in the middle.' IsControlElement=false
 ++++description Name=' '
 ++++link Name='Link with image at the end'
+++++++description Name='Link with image at the ' IsControlElement=false
 ++++++img Name='end'

content/test/data/accessibility/html/action-verbs-expected-uia-win.txt

@@ -2,8 +2,10 @@ document Name='Action verbs'
 ++group
 ++++description Name='Generic div'
 ++heading Name='Heading'
+++++description Name='Heading' IsControlElement=false
 ++button Name='Button'
 ++link Name='Link'
+++++description Name='Link' IsControlElement=false
 ++textbox
 ++searchbox
 ++textbox
@@ -22,6 +24,7 @@ document Name='Action verbs'
 ++++description Name='Div with click handler'
 ++group
 ++++group
+++++++description Name='Paragraph with click handler on parent' IsControlElement=false
 ++menu Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
 ++++menuitem Name='Menu item 1'
 ++++menuitemcheckbox Name='Menu item 2' Toggle.ToggleState='On'

content/test/data/accessibility/html/aside-expected-uia-win.txt

@@ -3,5 +3,6 @@ document
 ++++description Name='The aside tag defines some content aside from the content it is placed in.'
 ++complementary
 ++++heading Name='Aside tag'
+++++++description Name='Aside tag' IsControlElement=false
 ++++group
 ++++++description Name='The aside content should be related to the surrounding content.'

content/test/data/accessibility/html/button-name-calc-expected-uia-win.txt

@@ -6,9 +6,15 @@ document
 ++button Name='LabelledBy4' FullDescription='DescribedBy4'
 ++button Name='InnerText5' FullDescription='DescribedBy5'
 ++button Name='Outer inner'
+++++description Name='Outer' IsControlElement=false
 ++++group
+++++++description Name='inner' IsControlElement=false
 ++button Name='Outer inner1'
+++++description Name='Outer' IsControlElement=false
 ++++group Name='inner1'
+++++++description Name='inner2' IsControlElement=false
 ++button Name='Outer grandchild'
+++++description Name='Outer' IsControlElement=false
 ++++group
 ++++++group
+++++++++description Name='grandchild' IsControlElement=false

content/test/data/accessibility/html/canvas-expected-uia-win.txt

@@ -4,3 +4,4 @@ document
 ++++++description Name='Static fallback'
 ++++img
 ++++++link Name='Interactive fallback'
+++++++++description Name='Interactive fallback' IsControlElement=false

content/test/data/accessibility/html/canvas-fallback-expected-uia-win.txt

@@ -11,8 +11,11 @@ document
 ++++++++description Name='This is another paragraph in fallback'
 ++++++description Name='<newline>    '
 ++++++heading Name='Aria hidden paragraph in fallback content'
+++++++++description Name='Aria hidden paragraph in fallback content' IsControlElement=false
 ++++++description Name='<newline>    '
 ++++++heading
+++++++++description Name='Display none text in fallback content ' IsControlElement=false
 ++++++description Name='<newline>    '
 ++++++heading
+++++++++description Name='Visibility hidden paragraph in fallback content' IsControlElement=false
 ++++++description Name='<newline>  '

content/test/data/accessibility/html/caption-expected-uia-win.txt

@@ -4,10 +4,16 @@ document
 ++++++description Name='Browser and Engine'
 ++++row
 ++++++columnheader Name='Browser' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='Browser' IsControlElement=false
 ++++++columnheader Name='Engine' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='Engine' IsControlElement=false
 ++++row
 ++++++gridcell Name='Chrome' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='Chrome' IsControlElement=false
 ++++++gridcell Name='Blink' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='Blink' IsControlElement=false
 ++++row
 ++++++gridcell Name='Safari' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=2 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='Safari' IsControlElement=false
 ++++++gridcell Name='WebKit' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=2 GridItem.RowSpan=1 GridItem.ContainingGrid='Browser and Engine'
+++++++++description Name='WebKit' IsControlElement=false

content/test/data/accessibility/html/contenteditable-descendants-expected-uia-win.txt

@@ -3,6 +3,7 @@ document
 ++++group
 ++++++description Name='A contenteditable with a '
 ++++++link Name='link'
+++++++++description Name='link' IsControlElement=false
 ++++++description Name=' and an '
 ++++++img Name='Image'
 ++++++description Name=' and a '
@@ -11,9 +12,11 @@ document
 ++++grid Grid.ColumnCount=1 Grid.RowCount=1 Table.RowOrColumnMajor='RowMajor'
 ++++++row
 ++++++++gridcell Name='Always expose editable tables as tables.' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++++description Name='Always expose editable tables as tables.' IsControlElement=false
 ++++list
 ++++++listitem
 ++++++++description Name='1. '
+++++++++description Name='Editable list item.' IsControlElement=false
 ++group
 ++++description Name='Non-editable paragraph.'
 ++group

content/test/data/accessibility/html/contenteditable-descendants-with-selection-expected-uia-win.txt

@@ -3,6 +3,7 @@ document
 ++++group
 ++++++description Name='A contenteditable with a '
 ++++++link Name='link'
+++++++++description Name='link' IsControlElement=false
 ++++++description Name=' and an '
 ++++++img Name='Image'
 ++++++description Name=' and a '
@@ -11,6 +12,8 @@ document
 ++++grid Grid.ColumnCount=1 Grid.RowCount=1 Table.RowOrColumnMajor='RowMajor'
 ++++++row
 ++++++++gridcell Name='Always expose editable tables as tables.' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++++description Name='Always expose editable tables as tables.' IsControlElement=false
 ++++list
 ++++++listitem
 ++++++++description Name='1. '
+++++++++description Name='Editable list item.' IsControlElement=false

content/test/data/accessibility/html/element-class-id-src-attr-expected-uia-win.txt

 document
 ++heading Name='Image'
+++++description Name='Image' IsControlElement=false
 ++img Name='ImageAlt'

content/test/data/accessibility/html/fieldset-expected-uia-win.txt

@@ -2,3 +2,4 @@ document
 ++form
 ++++group Name='Browser Engines:'
 ++++++description
+++++++++description Name='Browser Engines:' IsControlElement=false

content/test/data/accessibility/html/heading-expected-uia-win.txt

 document
 ++heading Name='Heading 1'
+++++description Name='Heading 1' IsControlElement=false
 ++heading Name='Heading 2'
+++++description Name='Heading 2' IsControlElement=false
 ++heading Name='Heading 3'
+++++description Name='Heading 3' IsControlElement=false
 ++heading Name='Heading 4'
+++++description Name='Heading 4' IsControlElement=false
 ++heading Name='Heading 5'
+++++description Name='Heading 5' IsControlElement=false
 ++heading Name='Heading 6'
+++++description Name='Heading 6' IsControlElement=false

content/test/data/accessibility/html/img-link-empty-alt-expected-uia-win.txt

 document
 ++group
 ++++link Name='unread '
+++++++description Name='unread ' IsControlElement=false
 ++++link Name='read '
+++++++description Name='read ' IsControlElement=false
 ++++link Name='read '
+++++++description Name='read ' IsControlElement=false
 ++++link Name='read'
 ++++++img
+++++++description Name='read' IsControlElement=false

content/test/data/accessibility/html/in-page-links-expected-uia-win.txt

 document
 ++link Name='Empty anchor'
+++++description Name='Empty anchor' IsControlElement=false
 ++description Name=' '
 ++link Name='Anchor with content'
+++++description Name='Anchor with content' IsControlElement=false
 ++description Name=' '
 ++link Name='Anchor with ID'
+++++description Name='Anchor with ID' IsControlElement=false
 ++description Name=' '
 ++link Name='Empty span'
+++++description Name='Empty span' IsControlElement=false
 ++description Name=' '
 ++link Name='Span with content'
+++++description Name='Span with content' IsControlElement=false
 ++description Name=' '
 ++link Name='Paragraph with content'
+++++description Name='Paragraph with content' IsControlElement=false
 ++group
 ++++link
 ++++description Name='After empty anchor'

content/test/data/accessibility/html/input-date-with-popup-open-multiple-expected-uia-win.txt

@@ -36,34 +36,35 @@ document
 ++++++++++spinbutton Name='Year Third date picker' RangeValue.IsReadOnly=false RangeValue.LargeChange=0.00 RangeValue.SmallChange=0.00 RangeValue.Maximum=275760.00 RangeValue.Minimum=1.00 RangeValue.Value=2008.00 Value.Value='2008'
 ++++++++++++description Name='2008'
 ++++++menu Name='Show date picker' ExpandCollapse.ExpandCollapseState='Collapsed'
-++++++document
-++++++++group
+++++++Name='Chrome Legacy Window' IsControlElement=false
+++++++++document
 ++++++++++group
 ++++++++++++group
-++++++++++++++button Name='Show month selection panel'
-++++++++++++++++img
-++++++++++++button Name='Show previous month'
-++++++++++++++img
-++++++++++++button Name='Today'
-++++++++++++++group
-++++++++++++button Name='Show next month'
-++++++++++++++img
-++++++++++++grid Grid.ColumnCount=0 Grid.RowCount=0 Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false Table.RowOrColumnMajor='RowMajor'
 ++++++++++++++group
+++++++++++++++++button Name='Show month selection panel'
+++++++++++++++++++description IsControlElement=false
+++++++++++++++++++img
+++++++++++++++button Name='Show previous month'
+++++++++++++++++img
+++++++++++++++button Name='Today'
 ++++++++++++++++group
-++++++++++++++++++description Name='Sun'
-++++++++++++++++group
-++++++++++++++++++description Name='Mon'
-++++++++++++++++group
-++++++++++++++++++description Name='Tue'
-++++++++++++++++group
-++++++++++++++++++description Name='Wed'
-++++++++++++++++group
-++++++++++++++++++description Name='Thu'
-++++++++++++++++group
-++++++++++++++++++description Name='Fri'
+++++++++++++++button Name='Show next month'
+++++++++++++++++img
+++++++++++++++grid Grid.ColumnCount=0 Grid.RowCount=0 Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false Table.RowOrColumnMajor='RowMajor'
 ++++++++++++++++group
-++++++++++++++++++description Name='Sat'
-++++++++++++++group
+++++++++++++++++++group
+++++++++++++++++++++description Name='Sun'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Mon'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Tue'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Wed'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Thu'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Fri'
+++++++++++++++++++group
+++++++++++++++++++++description Name='Sat'
 ++++++++++++++++group
-
+++++++++++++++++++group

content/test/data/accessibility/html/input-submit-expected-uia-win.txt

@@ -7,6 +7,8 @@ document
 ++++textbox
 ++++button Name='First image button in a form is a valid default button'
 ++++++img
+++++++description Name='First image button in a form is a valid default button' IsControlElement=false
 ++++button Name='Second image button in a form not a valid default button'
 ++++++img
+++++++description Name='Second image button in a form not a valid default button' IsControlElement=false
 ++button Name='Submit outside of form not a valid default button'

content/test/data/accessibility/html/input-types-expected-uia-win.txt

@@ -21,6 +21,7 @@ document
 ++++++description Name='Image: '
 ++++++button Name='Image:'
 ++++++++img
+++++++++description Name='Submit' IsControlElement=false
 ++++description
 ++++++description Name='Number: '
 ++++++spinbutton Name='Number:' RangeValue.IsReadOnly=false RangeValue.LargeChange=10.00 RangeValue.SmallChange=1.00 RangeValue.Maximum=0.00 RangeValue.Minimum=0.00 RangeValue.Value=0.00

content/test/data/accessibility/html/landmark-expected-uia-win.txt

@@ -49,11 +49,13 @@ document
 ++++++description Name='Details'
 ++group
 ++++group
+++++++description Name='This should NOT have banner role.' IsControlElement=false
 ++group
 ++++group
 ++++++description Name='This should NOT have banner role.'
 ++group
 ++++group
+++++++description Name='This should NOT have banner role.' IsControlElement=false
 ++main
 ++++group
 ++++++description Name='This should NOT have banner role.'
@@ -77,6 +79,7 @@ document
 ++++++description Name='Details'
 ++group
 ++++group
+++++++description Name='This should NOT have banner role.' IsControlElement=false
 ++group
 ++++group
 ++++++description Name='This should NOT have banner role.'
@@ -105,6 +108,7 @@ document
 ++++++description Name='Details'
 ++group
 ++++group
+++++++description Name='This should NOT have footer role.' IsControlElement=false
 ++group
 ++++group
 ++++++description Name='This should NOT have footer role.'
@@ -133,11 +137,13 @@ document
 ++++++description Name='Details'
 ++group
 ++++group
+++++++description Name='This should NOT have footer role.' IsControlElement=false
 ++group
 ++++group
 ++++++description Name='This should NOT have footer role.'
 ++group
 ++++group
+++++++description Name='This should NOT have footer role.' IsControlElement=false
 ++main
 ++++group
 ++++++description Name='This should NOT have footer role.'

content/test/data/accessibility/html/legend-expected-uia-win.txt

@@ -2,5 +2,8 @@ document
 ++form
 ++++group Name='Browser Engines:'
 ++++++description
+++++++++description Name='Browser Engines:' IsControlElement=false
+++++++description Name='Browser: ' IsControlElement=false
 ++++++textbox
+++++++description Name=' Rendering Engine: ' IsControlElement=false
 ++++++textbox

content/test/data/accessibility/html/li-expected-uia-win.txt

@@ -2,7 +2,10 @@ document
 ++list
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 1' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 2' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 3' IsControlElement=false

content/test/data/accessibility/html/link-inside-heading-expected-uia-win.txt

 document
 ++heading Name='Link In Heading'
 ++++link Name='Link In Heading'
+++++++description Name='Link In Heading' IsControlElement=false

content/test/data/accessibility/html/list-expected-uia-win.txt

@@ -2,13 +2,19 @@ document
 ++list
 ++++listitem
 ++++++description Name='• '
+++++++description Name='tic' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='tac' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='toe' IsControlElement=false
 ++list
 ++++listitem
+++++++description Name='tic' IsControlElement=false
 ++++description Name=' '
 ++++listitem
+++++++description Name='tac' IsControlElement=false
 ++++description Name=' '
 ++++listitem
+++++++description Name='toe' IsControlElement=false

content/test/data/accessibility/html/list-markers-expected-uia-win.txt

@@ -2,7 +2,16 @@ document
 ++list
 ++++listitem
 ++++++description Name='• '
+++++++description Name='First item properly groups itself despite ' IsControlElement=false
+++++++description Name='bolded' IsControlElement=false
+++++++description Name=' text.' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='This should also be ' IsControlElement=false
+++++++description Name='seen' IsControlElement=false
+++++++description Name=' as a group.' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Some ' IsControlElement=false
+++++++description Name='more' IsControlElement=false
+++++++description Name=' text.' IsControlElement=false

content/test/data/accessibility/html/modal-dialog-opened-expected-uia-win.txt

@@ -3,3 +3,4 @@ document
 ++dialog Window.IsModal=true
 ++++description Name='The dialog subtree should be the only text content in the accessibility tree. '
 ++++link Name='Link inside the dialog.'
+++++++description Name='Link inside the dialog.' IsControlElement=false

content/test/data/accessibility/html/navigation-expected-uia-win.txt

 document
 ++navigation
 ++++link Name='Don't click on me'
+++++++description Name='Don't click on me' IsControlElement=false

content/test/data/accessibility/html/ol-expected-uia-win.txt

@@ -2,14 +2,20 @@ document
 ++list
 ++++listitem
 ++++++description Name='1. '
+++++++description Name='Chrome' IsControlElement=false
 ++++listitem
 ++++++description Name='2. '
+++++++description Name='Safari' IsControlElement=false
 ++++listitem
 ++++++description Name='3. '
+++++++description Name='IE' IsControlElement=false
 ++list
 ++++listitem
 ++++++description Name='10. '
+++++++description Name='Android' IsControlElement=false
 ++++listitem
 ++++++description Name='11. '
+++++++description Name='Mac' IsControlElement=false
 ++++listitem
 ++++++description Name='12. '
+++++++description Name='Windows' IsControlElement=false

content/test/data/accessibility/html/optgroup-expected-uia-win.txt

@@ -2,11 +2,13 @@ document
 ++group
 ++++listbox Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false Value.IsReadOnly=false
 ++++++group Name='Enabled'
+++++++++description Name='Enabled' IsControlElement=false
 ++++++option Name='One' SelectionItem.IsSelected=false
 ++++++option Name='Two' SelectionItem.IsSelected=false
 ++++++option Name='Three' SelectionItem.IsSelected=false
 ++++++option Name='Four' SelectionItem.IsSelected=false
 ++++++group Name='Disabled'
+++++++++description Name='Disabled' IsControlElement=false
 ++++++option Name='One' IsEnabled=false
 ++++++option Name='Two' IsEnabled=false
 ++++++option Name='Three' IsEnabled=false

content/test/data/accessibility/html/selection-container-expected-uia-win.txt

@@ -2,6 +2,7 @@ document
 ++group
 ++++listbox Name='selection_list' Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
 ++++++group Name='Enabled'
+++++++++description Name='Enabled' IsControlElement=false
 ++++++option Name='One' SelectionItem.IsSelected=false SelectionItem.SelectionContainer='selection_list'
 ++++++option Name='Two' SelectionItem.IsSelected=false SelectionItem.SelectionContainer='selection_list'
 ++++++option Name='Three' SelectionItem.IsSelected=false SelectionItem.SelectionContainer='selection_list'

content/test/data/accessibility/html/span-expected-uia-win.txt

@@ -13,24 +13,30 @@ document
 ++++description Name='E1. Eat'
 ++++description Name=' '
 ++++link Name='space'
+++++++description Name='space' IsControlElement=false
 ++group
 ++++description Name='E2. Eat'
 ++++description Name=' '
 ++++link Name='space'
+++++++description Name='space' IsControlElement=false
 ++group
 ++++description Name='E3. Eat'
 ++++description Name=' '
 ++++link Name='space'
+++++++description Name='space' IsControlElement=false
 ++group
 ++++link Name='E4. Eat'
+++++++description Name='E4. Eat' IsControlElement=false
 ++++description Name=' '
 ++++description Name='space'
 ++group
 ++++link Name='E5. Eat'
+++++++description Name='E5. Eat' IsControlElement=false
 ++++description Name=' '
 ++++description Name='space'
 ++group
 ++++link Name='E6. Eat'
+++++++description Name='E6. Eat' IsControlElement=false
 ++++description Name=' '
 ++++description Name='space'
 ++group

content/test/data/accessibility/html/table-focusable-sections-expected-uia-win.txt

@@ -3,15 +3,23 @@ document Name='Table example - focusable thead, tbody, tfoot'
 ++++group
 ++++++row
 ++++++++columnheader Name='Sum' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++++description Name='Sum' IsControlElement=false
 ++++++++columnheader Name='Subtraction' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++++description Name='Subtraction' IsControlElement=false
 ++++group
 ++++++row
 ++++++++gridcell Name='10' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++++description Name='10' IsControlElement=false
 ++++++++gridcell Name='7' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++++description Name='7' IsControlElement=false
 ++++++row
 ++++++++gridcell Name='2' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=2 GridItem.RowSpan=1
+++++++++++description Name='2' IsControlElement=false
 ++++++++gridcell Name='4' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=2 GridItem.RowSpan=1
+++++++++++description Name='4' IsControlElement=false
 ++++group
 ++++++row
 ++++++++gridcell Name='12' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=3 GridItem.RowSpan=1
+++++++++++description Name='12' IsControlElement=false
 ++++++++gridcell Name='3' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=3 GridItem.RowSpan=1
+++++++++++description Name='3' IsControlElement=false

content/test/data/accessibility/html/table-th-colheader-expected-uia-win.txt

@@ -2,7 +2,11 @@ document
 ++grid Grid.ColumnCount=2 Grid.RowCount=2 Table.RowOrColumnMajor='RowMajor'
 ++++row
 ++++++columnheader Name='Firstname' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++description Name='Firstname' IsControlElement=false
 ++++++columnheader Name='Lastname' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++description Name='Lastname' IsControlElement=false
 ++++row
 ++++++gridcell Name='Jill' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++description Name='Jill' IsControlElement=false
 ++++++gridcell Name='Smith' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++description Name='Smith' IsControlElement=false

content/test/data/accessibility/html/table-th-rowheader-expected-uia-win.txt

@@ -2,7 +2,11 @@ document Name='Table example - th rowheader'
 ++grid Grid.ColumnCount=2 Grid.RowCount=2 Table.RowOrColumnMajor='RowMajor'
 ++++row
 ++++++rowheader Name='Firstname' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++description Name='Firstname' IsControlElement=false
 ++++++gridcell Name='Jill' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=0 GridItem.RowSpan=1
+++++++++description Name='Jill' IsControlElement=false
 ++++row
 ++++++rowheader Name='Lastname' GridItem.Column=0 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++description Name='Lastname' IsControlElement=false
 ++++++gridcell Name='Smith' GridItem.Column=1 GridItem.ColumnSpan=1 GridItem.Row=1 GridItem.RowSpan=1
+++++++++description Name='Smith' IsControlElement=false

content/test/data/accessibility/html/ul-expected-uia-win.txt

@@ -2,7 +2,10 @@ document
 ++list
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 1' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 2' IsControlElement=false
 ++++listitem
 ++++++description Name='• '
+++++++description Name='Item 3' IsControlElement=false