Skip to content

Commit efc714e

Browse files
marco-cmarco-c
committed
Revert "Bug 1981349 - Add referenceTarget support for label/for, label wrapped and output/for. r=credential-management-reviewers,webidl,dimi,Jamie,smaug" for causing accessibility crashes (bug 2008970)
This reverts commit d46abe6d763df3ce5c5b20673ed531c4e79c49e4. Revert "Bug 1981346 - Add referenceTarget support for the form attribute. r=credential-management-reviewers,webidl,dimi,Jamie,smaug" This reverts commit df11a4666db1180c795dcdc76d03dc1e208d9ce7. Revert "Bug 1981345 - Implement referenceTarget support for multiple element attributes. r=dom-core,Jamie,smaug" This reverts commit 89cc779f5ebf6226e15705f5b5cf2ddd76840517. Revert "Bug 1984685 - Refactor: consistently return Maybe<nsTArray<RefPtr<Element>>> when getting attr-associated elements, and key AttrRelProviders on nsAtom rather than nsString. r=dom-core,morgan,Jamie,smaug" This reverts commit 33130e712d0acf4a43cc8627d188112c3806dbb7. Revert "Bug 1981344 - Implement referenceTarget support for single-element attributes. r=dom-core,credential-management-reviewers,webidl,layout-reviewers,emilio,keithamus,smaug,mtigley" This reverts commit d6440c4cae21406bb00f223c2432ade356eed6e9. Revert "Bug 1983766 - Split single element attribute getters into bindings/internals versions. r=dom-core,credential-management-reviewers,webidl,layout-reviewers,smaug,keithamus,jwatt,mtigley" This reverts commit 83b70e0645d2dfaedd299393da58da55cb7355fe. Revert "Bug 1989323 - Make `referenceTarget` IDL attributes on ShadowRoot, HTMLTemplateElement and ShadowRootInit nullable. r=dom-core,webidl,saschanaz,smaug" This reverts commit 3a0b29121e2273701a63210a4dc075f1fa60c976. UltraBlame original commit: b9e21434cf454a178ce807ed2fd2b891937aea7c
1 parent 1de3fa5 commit efc714e

File tree

92 files changed

+35628
-16652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+35628
-16652
lines changed

‎accessible/base/AccIterator.cpp‎

Lines changed: 580 additions & 378 deletions
Large diffs are not rendered by default.

‎accessible/base/AccIterator.h‎

Lines changed: 76 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -138,41 +138,12 @@ h
138138
#
139139
include
140140
"
141-
mozilla
142-
/
143-
dom
144-
/
145-
Element
146-
.
147-
h
148-
"
149-
#
150-
include
151-
"
152141
nsTArray
153142
.
154143
h
155144
"
156145
#
157146
include
158-
"
159-
nsContentUtils
160-
.
161-
h
162-
"
163-
#
164-
include
165-
"
166-
mozilla
167-
/
168-
dom
169-
/
170-
TreeOrderedArray
171-
.
172-
h
173-
"
174-
#
175-
include
176147
<
177148
memory
178149
>
@@ -188,14 +159,7 @@ dom
188159
class
189160
Element
190161
;
191-
class
192-
HTMLLabelElement
193-
;
194162
}
195-
/
196-
/
197-
namespace
198-
dom
199163
namespace
200164
a11y
201165
{
@@ -595,11 +559,6 @@ RelatedAccIterator
595559
&
596560
)
597561
;
598-
void
599-
Initialize
600-
(
601-
)
602-
;
603562
DocAccessible
604563
*
605564
mDocument
@@ -612,29 +571,18 @@ nsAtom
612571
*
613572
mRelAttr
614573
;
615-
dom
574+
DocAccessible
616575
:
617576
:
618-
TreeOrderedArray
619-
<
620-
nsIContent
577+
AttrRelProviders
621578
*
622-
TreeKind
623-
:
624-
:
625-
ShadowIncludingDOM
626-
>
627-
mRelatedNodes
579+
mProviders
628580
;
629-
size_t
630-
mNextIndex
631-
=
632-
0
581+
uint32_t
582+
mIndex
633583
;
634584
bool
635-
mInitialized
636-
=
637-
false
585+
mIsWalkingDependentElements
638586
;
639587
}
640588
;
@@ -1157,6 +1105,22 @@ AssociatedElementsIterator
11571105
*
11581106
Return
11591107
next
1108+
ID
1109+
.
1110+
*
1111+
/
1112+
const
1113+
nsDependentSubstring
1114+
NextID
1115+
(
1116+
)
1117+
;
1118+
/
1119+
*
1120+
*
1121+
*
1122+
Return
1123+
next
11601124
element
11611125
.
11621126
*
@@ -1171,6 +1135,50 @@ NextElem
11711135
)
11721136
;
11731137
/
1138+
*
1139+
*
1140+
*
1141+
Return
1142+
the
1143+
element
1144+
with
1145+
the
1146+
given
1147+
ID
1148+
.
1149+
*
1150+
/
1151+
static
1152+
dom
1153+
:
1154+
:
1155+
Element
1156+
*
1157+
GetElem
1158+
(
1159+
nsIContent
1160+
*
1161+
aContent
1162+
const
1163+
nsAString
1164+
&
1165+
aID
1166+
)
1167+
;
1168+
dom
1169+
:
1170+
:
1171+
Element
1172+
*
1173+
GetElem
1174+
(
1175+
const
1176+
nsDependentSubstring
1177+
&
1178+
aID
1179+
)
1180+
;
1181+
/
11741182
/
11751183
AccIterable
11761184
virtual
@@ -1203,6 +1211,9 @@ AssociatedElementsIterator
12031211
&
12041212
)
12051213
;
1214+
nsString
1215+
mIDs
1216+
;
12061217
nsIContent
12071218
*
12081219
mContent
@@ -1211,15 +1222,19 @@ DocAccessible
12111222
*
12121223
mDoc
12131224
;
1225+
nsAString
1226+
:
1227+
:
1228+
index_type
1229+
mCurrIdx
1230+
;
12141231
nsTArray
12151232
<
1216-
RefPtr
1217-
<
12181233
dom
12191234
:
12201235
:
12211236
Element
1222-
>
1237+
*
12231238
>
12241239
mElements
12251240
;

‎accessible/base/nsAccUtils.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3963,19 +3963,7 @@ kNameSpaceID_None
39633963
)
39643964
;
39653965
}
3966-
Maybe
3967-
<
3968-
nsTArray
3969-
<
3970-
RefPtr
3971-
<
3972-
dom
3973-
:
3974-
:
3975-
Element
3976-
>
3977-
>
3978-
>
3966+
bool
39793967
nsAccUtils
39803968
:
39813969
:
@@ -3990,6 +3978,16 @@ aElement
39903978
nsAtom
39913979
*
39923980
aName
3981+
nsTArray
3982+
<
3983+
dom
3984+
:
3985+
:
3986+
Element
3987+
*
3988+
>
3989+
&
3990+
aElements
39933991
)
39943992
{
39953993
if
@@ -4003,15 +4001,18 @@ aName
40034001
)
40044002
)
40054003
{
4006-
return
40074004
aElement
40084005
-
40094006
>
40104007
GetExplicitlySetAttrElements
40114008
(
40124009
aName
4010+
aElements
40134011
)
40144012
;
4013+
return
4014+
true
4015+
;
40154016
}
40164017
if
40174018
(
@@ -4049,14 +4050,13 @@ internals
40494050
GetAttrElements
40504051
(
40514052
aName
4053+
aElements
40524054
)
40534055
;
40544056
}
40554057
}
40564058
return
4057-
Nothing
4058-
(
4059-
)
4059+
false
40604060
;
40614061
}
40624062
bool

‎accessible/base/nsAccUtils.h‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,19 +1855,7 @@ aName
18551855
)
18561856
;
18571857
static
1858-
Maybe
1859-
<
1860-
nsTArray
1861-
<
1862-
RefPtr
1863-
<
1864-
dom
1865-
:
1866-
:
1867-
Element
1868-
>
1869-
>
1870-
>
1858+
bool
18711859
GetARIAElementsAttr
18721860
(
18731861
dom
@@ -1879,6 +1867,16 @@ aElement
18791867
nsAtom
18801868
*
18811869
aName
1870+
nsTArray
1871+
<
1872+
dom
1873+
:
1874+
:
1875+
Element
1876+
*
1877+
>
1878+
&
1879+
aElements
18821880
)
18831881
;
18841882
static

‎accessible/base/nsAccessibilityService.cpp‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,17 +2141,26 @@ Accessible
21412141
for
21422142
it
21432143
.
2144+
nsAutoString
2145+
id
2146+
;
21442147
if
21452148
(
2146-
nsAtom
2147-
*
2148-
id
2149-
=
2150-
aContent
2151-
-
2152-
>
2149+
nsCoreUtils
2150+
:
2151+
:
21532152
GetID
21542153
(
2154+
aContent
2155+
id
2156+
)
2157+
&
2158+
&
2159+
!
2160+
id
2161+
.
2162+
IsEmpty
2163+
(
21552164
)
21562165
)
21572166
{

‎accessible/base/nsCoreUtils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ label
621621
label
622622
-
623623
>
624-
GetLabeledElementInternal
624+
GetControl
625625
(
626626
)
627627
)

0 commit comments

Comments
 (0)