Skip to content

Commit f36ae84

Browse files
jcstehjcsteh
committed
Bug 1862802 part 5: Remove virtual cursor change event. r=eeejay
Depends on D192645 Differential Revision: https://phabricator.services.mozilla.com/D192646
1 parent 603681f commit f36ae84

19 files changed

+8
-223
lines changed

‎accessible/android/AccessibleWrap.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,6 @@ Accessible* AccessibleWrap::DoPivot(Accessible* aAccessible,
121121
return nullptr;
122122
}
123123

124-
bool AccessibleWrap::PivotTo(int32_t aGranularity, bool aForward,
125-
bool aInclusive) {
126-
Accessible* result = DoPivot(this, aGranularity, aForward, aInclusive);
127-
if (result) {
128-
MOZ_ASSERT(result->IsLocal());
129-
// Dispatch a virtual cursor change event that will be turned into an
130-
// android accessibility focused changed event in the parent.
131-
PivotMoveReason reason = aForward ? nsIAccessiblePivot::REASON_NEXT
132-
: nsIAccessiblePivot::REASON_PREV;
133-
LocalAccessible* localResult = result->AsLocal();
134-
RefPtr<AccEvent> event = new AccVCChangeEvent(
135-
localResult->Document(), this, localResult, reason, eFromUserInput);
136-
nsEventShell::FireEvent(event);
137-
138-
return true;
139-
}
140-
141-
return false;
142-
}
143-
144124
Accessible* AccessibleWrap::ExploreByTouch(Accessible* aAccessible, float aX,
145125
float aY) {
146126
Accessible* root;

‎accessible/android/AccessibleWrap.h

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ class AccessibleWrap : public LocalAccessible {
2727

2828
virtual bool DoAction(uint8_t aIndex) const override;
2929

30-
MOZ_CAN_RUN_SCRIPT_BOUNDARY
31-
virtual bool PivotTo(int32_t aGranularity, bool aForward, bool aInclusive);
32-
3330
static Accessible* ExploreByTouch(Accessible* aAccessible, float aX,
3431
float aY);
3532

‎accessible/android/Platform.cpp

-18
Original file line numberDiff line numberDiff line change
@@ -193,24 +193,6 @@ void a11y::PlatformShowHideEvent(Accessible* aTarget, Accessible* aParent,
193193

194194
void a11y::PlatformSelectionEvent(Accessible*, Accessible*, uint32_t) {}
195195

196-
void a11y::PlatformVirtualCursorChangeEvent(Accessible* aTarget,
197-
Accessible* aOldPosition,
198-
Accessible* aNewPosition,
199-
int16_t aReason, bool aFromUser) {
200-
if (!aNewPosition || !aFromUser) {
201-
return;
202-
}
203-
204-
RefPtr<SessionAccessibility> sessionAcc =
205-
SessionAccessibility::GetInstanceFor(aTarget);
206-
207-
if (!sessionAcc) {
208-
return;
209-
}
210-
211-
sessionAcc->SendAccessibilityFocusedEvent(aNewPosition);
212-
}
213-
214196
void a11y::PlatformScrollingEvent(Accessible* aTarget, uint32_t aEventType,
215197
uint32_t aScrollX, uint32_t aScrollY,
216198
uint32_t aMaxScrollX, uint32_t aMaxScrollY) {

‎accessible/base/AccEvent.cpp

-24
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,6 @@ AccSelChangeEvent::AccSelChangeEvent(LocalAccessible* aWidget,
161161
}
162162
}
163163

164-
////////////////////////////////////////////////////////////////////////////////
165-
// AccVCChangeEvent
166-
////////////////////////////////////////////////////////////////////////////////
167-
168-
AccVCChangeEvent::AccVCChangeEvent(LocalAccessible* aAccessible,
169-
LocalAccessible* aOldAccessible,
170-
LocalAccessible* aNewAccessible,
171-
int16_t aReason,
172-
EIsFromUserInput aIsFromUserInput)
173-
: AccEvent(::nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED, aAccessible,
174-
aIsFromUserInput),
175-
mOldAccessible(aOldAccessible),
176-
mNewAccessible(aNewAccessible),
177-
mReason(aReason) {}
178-
179164
already_AddRefed<nsIAccessibleEvent> a11y::MakeXPCEvent(AccEvent* aEvent) {
180165
DocAccessible* doc = aEvent->Document();
181166
LocalAccessible* acc = aEvent->GetAccessible();
@@ -240,15 +225,6 @@ already_AddRefed<nsIAccessibleEvent> a11y::MakeXPCEvent(AccEvent* aEvent) {
240225
return xpEvent.forget();
241226
}
242227

243-
if (eventGroup & (1 << AccEvent::eVirtualCursorChangeEvent)) {
244-
AccVCChangeEvent* vcc = downcast_accEvent(aEvent);
245-
xpEvent = new xpcAccVirtualCursorChangeEvent(
246-
type, ToXPC(acc), ToXPCDocument(doc), node, fromUser,
247-
ToXPC(vcc->OldAccessible()), ToXPC(vcc->NewAccessible()),
248-
vcc->Reason());
249-
return xpEvent.forget();
250-
}
251-
252228
if (eventGroup & (1 << AccEvent::eObjectAttrChangedEvent)) {
253229
AccObjectAttrChangedEvent* oac = downcast_accEvent(aEvent);
254230
nsString attribute;

‎accessible/base/AccEvent.h

-30
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class AccEvent {
102102
eCaretMoveEvent,
103103
eTextSelChangeEvent,
104104
eSelectionChangeEvent,
105-
eVirtualCursorChangeEvent,
106105
eObjectAttrChangedEvent,
107106
eScrollingEvent,
108107
eAnnouncementEvent,
@@ -441,35 +440,6 @@ class AccSelChangeEvent : public AccEvent {
441440
friend class EventQueue;
442441
};
443442

444-
/**
445-
* Accessible virtual cursor change event.
446-
*/
447-
class AccVCChangeEvent : public AccEvent {
448-
public:
449-
AccVCChangeEvent(LocalAccessible* aAccessible,
450-
LocalAccessible* aOldAccessible,
451-
LocalAccessible* aNewAccessible, int16_t aReason,
452-
EIsFromUserInput aIsFromUserInput = eFromUserInput);
453-
454-
virtual ~AccVCChangeEvent() {}
455-
456-
// AccEvent
457-
static const EventGroup kEventGroup = eVirtualCursorChangeEvent;
458-
virtual unsigned int GetEventGroups() const override {
459-
return AccEvent::GetEventGroups() | (1U << eVirtualCursorChangeEvent);
460-
}
461-
462-
// AccVCChangeEvent
463-
LocalAccessible* OldAccessible() const { return mOldAccessible; }
464-
LocalAccessible* NewAccessible() const { return mNewAccessible; }
465-
int32_t Reason() const { return mReason; }
466-
467-
private:
468-
RefPtr<LocalAccessible> mOldAccessible;
469-
RefPtr<LocalAccessible> mNewAccessible;
470-
int16_t mReason;
471-
};
472-
473443
/**
474444
* Accessible object attribute changed event.
475445
*/

‎accessible/base/Platform.h

-5
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ void PlatformSelectionEvent(Accessible* aTarget, Accessible* aWidget,
110110
uint32_t aType);
111111

112112
#if defined(ANDROID)
113-
void PlatformVirtualCursorChangeEvent(Accessible* aTarget,
114-
Accessible* aOldPosition,
115-
Accessible* aNewPosition, int16_t aReason,
116-
bool aFromUser);
117-
118113
void PlatformScrollingEvent(Accessible* aTarget, uint32_t aEventType,
119114
uint32_t aScrollX, uint32_t aScrollY,
120115
uint32_t aMaxScrollX, uint32_t aMaxScrollY);

‎accessible/base/nsAccessibilityService.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ already_AddRefed<DOMStringList> nsAccessibilityService::GetStringStates(
10061006

10071007
void nsAccessibilityService::GetStringEventType(uint32_t aEventType,
10081008
nsAString& aString) {
1009-
NS_ASSERTION(
1009+
static_assert(
10101010
nsIAccessibleEvent::EVENT_LAST_ENTRY == ArrayLength(kEventTypeNames),
10111011
"nsIAccessibleEvent constants are out of sync to kEventTypeNames");
10121012

‎accessible/base/nsAccessibilityService.h

-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@ static const char kEventTypeNames[][40] = {
481481
"window minimize", // EVENT_WINDOW_MINIMIZE
482482
"window restore", // EVENT_WINDOW_RESTORE
483483
"object attribute changed", // EVENT_OBJECT_ATTRIBUTE_CHANGED
484-
"virtual cursor changed", // EVENT_VIRTUALCURSOR_CHANGED
485484
"text value change", // EVENT_TEXT_VALUE_CHANGE
486485
"scrolling", // EVENT_SCROLLING
487486
"announcement", // EVENT_ANNOUNCEMENT

‎accessible/generic/LocalAccessible.cpp

-19
Original file line numberDiff line numberDiff line change
@@ -936,16 +936,6 @@ nsresult LocalAccessible::HandleAccEvent(AccEvent* aEvent) {
936936
aEvent->GetEventType());
937937
break;
938938
}
939-
case nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED: {
940-
AccVCChangeEvent* vcEvent = downcast_accEvent(aEvent);
941-
LocalAccessible* position = vcEvent->NewAccessible();
942-
LocalAccessible* oldPosition = vcEvent->OldAccessible();
943-
ipcDoc->SendVirtualCursorChangeEvent(
944-
id, oldPosition ? oldPosition->ID() : 0,
945-
position ? position->ID() : 0, vcEvent->Reason(),
946-
vcEvent->IsFromUserInput());
947-
break;
948-
}
949939
case nsIAccessibleEvent::EVENT_FOCUS:
950940
ipcDoc->SendFocusEvent(id);
951941
break;
@@ -1061,15 +1051,6 @@ nsresult LocalAccessible::HandleAccEvent(AccEvent* aEvent) {
10611051
aEvent->GetEventType());
10621052
break;
10631053
}
1064-
case nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED: {
1065-
#ifdef ANDROID
1066-
AccVCChangeEvent* vcEvent = downcast_accEvent(aEvent);
1067-
PlatformVirtualCursorChangeEvent(
1068-
target, vcEvent->OldAccessible(), vcEvent->NewAccessible(),
1069-
vcEvent->Reason(), vcEvent->IsFromUserInput());
1070-
#endif
1071-
break;
1072-
}
10731054
case nsIAccessibleEvent::EVENT_FOCUS: {
10741055
LayoutDeviceIntRect rect;
10751056
// The caret rect is only used on Windows, so just pass an empty rect on

‎accessible/interfaces/moz.build

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ XPIDL_SOURCES += [
4040
"nsIAccessibleTextSelectionChangeEvent.idl",
4141
"nsIAccessibleTypes.idl",
4242
"nsIAccessibleValue.idl",
43-
"nsIAccessibleVirtualCursorChangeEvent.idl",
4443
]
4544

4645
XPIDL_MODULE = "accessibility"

‎accessible/interfaces/nsIAccessibleEvent.idl

+7-12
Original file line numberDiff line numberDiff line change
@@ -182,46 +182,41 @@ interface nsIAccessibleEvent : nsISupports
182182
*/
183183
const unsigned long EVENT_OBJECT_ATTRIBUTE_CHANGED = 0x0022;
184184

185-
/**
186-
* A cursorable's virtual cursor has changed.
187-
*/
188-
const unsigned long EVENT_VIRTUALCURSOR_CHANGED = 0x0023;
189-
190185
/**
191186
* An object's text Value has changed.
192187
*/
193-
const unsigned long EVENT_TEXT_VALUE_CHANGE = 0x0024;
188+
const unsigned long EVENT_TEXT_VALUE_CHANGE = 0x0023;
194189

195190
/**
196191
* An accessible's viewport is scrolling.
197192
*/
198-
const unsigned long EVENT_SCROLLING = 0x0025;
193+
const unsigned long EVENT_SCROLLING = 0x0024;
199194

200195
/**
201196
* An accessible is making an explicit announcement.
202197
*/
203-
const unsigned long EVENT_ANNOUNCEMENT = 0x0026;
198+
const unsigned long EVENT_ANNOUNCEMENT = 0x0025;
204199

205200
/**
206201
* A live region has been introduced. Mac only.
207202
*/
208-
const unsigned long EVENT_LIVE_REGION_ADDED = 0x0027;
203+
const unsigned long EVENT_LIVE_REGION_ADDED = 0x0026;
209204

210205
/**
211206
* A live region has been removed (aria-live attribute changed). Mac Only.
212207
*/
213-
const unsigned long EVENT_LIVE_REGION_REMOVED = 0x0028;
208+
const unsigned long EVENT_LIVE_REGION_REMOVED = 0x0027;
214209

215210
/**
216211
* A reorder event that has been coalesced into a mutation
217212
* of an ancestor's subtree.
218213
*/
219-
const unsigned long EVENT_INNER_REORDER = 0x0029;
214+
const unsigned long EVENT_INNER_REORDER = 0x0028;
220215

221216
/**
222217
* Help make sure event map does not get out-of-line.
223218
*/
224-
const unsigned long EVENT_LAST_ENTRY = 0x002A;
219+
const unsigned long EVENT_LAST_ENTRY = 0x0029;
225220

226221
/**
227222
* The type of event, based on the enumerated event values

‎accessible/interfaces/nsIAccessiblePivot.idl

-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ interface nsIAccessibleTraversalRule;
2020
[scriptable, uuid(81fe5144-059b-42db-bd3a-f6ce3158d5e9)]
2121
interface nsIAccessiblePivot : nsISupports
2222
{
23-
// XXX: These are here for the VC changed event that has yet to go away.
24-
const PivotMoveReason REASON_NONE = 0;
25-
const PivotMoveReason REASON_NEXT = 1;
26-
const PivotMoveReason REASON_PREV = 2;
27-
const PivotMoveReason REASON_FIRST = 3;
28-
const PivotMoveReason REASON_LAST = 4;
29-
3023
/**
3124
* Move pivot to next object, from current position or given anchor,
3225
* complying to given traversal rule.

‎accessible/interfaces/nsIAccessibleVirtualCursorChangeEvent.idl

-29
This file was deleted.

‎accessible/ipc/DocAccessibleParent.cpp

-39
Original file line numberDiff line numberDiff line change
@@ -546,45 +546,6 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvSelectionEvent(
546546
return IPC_OK();
547547
}
548548

549-
mozilla::ipc::IPCResult DocAccessibleParent::RecvVirtualCursorChangeEvent(
550-
const uint64_t& aID, const uint64_t& aOldPositionID,
551-
const uint64_t& aNewPositionID, const int16_t& aReason,
552-
const bool& aFromUser) {
553-
ACQUIRE_ANDROID_LOCK
554-
if (mShutdown) {
555-
return IPC_OK();
556-
}
557-
558-
RemoteAccessible* target = GetAccessible(aID);
559-
RemoteAccessible* oldPosition = GetAccessible(aOldPositionID);
560-
RemoteAccessible* newPosition = GetAccessible(aNewPositionID);
561-
562-
if (!target) {
563-
NS_ERROR("no proxy for event!");
564-
return IPC_OK();
565-
}
566-
567-
#if defined(ANDROID)
568-
PlatformVirtualCursorChangeEvent(target, oldPosition, newPosition, aReason,
569-
aFromUser);
570-
#endif
571-
572-
if (!nsCoreUtils::AccEventObserversExist()) {
573-
return IPC_OK();
574-
}
575-
576-
xpcAccessibleDocument* doc = GetAccService()->GetXPCDocument(this);
577-
RefPtr<xpcAccVirtualCursorChangeEvent> event =
578-
new xpcAccVirtualCursorChangeEvent(
579-
nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED,
580-
GetXPCAccessible(target), doc, nullptr, aFromUser,
581-
GetXPCAccessible(oldPosition), GetXPCAccessible(newPosition),
582-
aReason);
583-
nsCoreUtils::DispatchAccEvent(std::move(event));
584-
585-
return IPC_OK();
586-
}
587-
588549
mozilla::ipc::IPCResult DocAccessibleParent::RecvScrollingEvent(
589550
const uint64_t& aID, const uint64_t& aType, const uint32_t& aScrollX,
590551
const uint32_t& aScrollY, const uint32_t& aMaxScrollX,

‎accessible/ipc/DocAccessibleParent.h

-5
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ class DocAccessibleParent : public RemoteAccessible,
125125
const uint64_t& aID, const uint64_t& aWidgetID,
126126
const uint32_t& aType) override;
127127

128-
virtual mozilla::ipc::IPCResult RecvVirtualCursorChangeEvent(
129-
const uint64_t& aID, const uint64_t& aOldPositionID,
130-
const uint64_t& aNewPositionID, const int16_t& aReason,
131-
const bool& aFromUser) override;
132-
133128
virtual mozilla::ipc::IPCResult RecvScrollingEvent(
134129
const uint64_t& aID, const uint64_t& aType, const uint32_t& aScrollX,
135130
const uint32_t& aScrollY, const uint32_t& aMaxScrollX,

‎accessible/ipc/PDocAccessible.ipdl

-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ parent:
7070
async SelectionEvent(uint64_t aID, uint64_t aWidgetID, uint32_t aType);
7171
async RoleChangedEvent(role aRole, uint8_t aRoleMapEntryIndex);
7272
async FocusEvent(uint64_t aID, LayoutDeviceIntRect aCaretRect);
73-
async VirtualCursorChangeEvent(uint64_t aID,
74-
uint64_t aOldPosition,
75-
uint64_t aPosition,
76-
int16_t aReason,
77-
bool aFromUservcEvent);
7873
async ScrollingEvent(uint64_t aID, uint64_t aType,
7974
uint32_t aScrollX, uint32_t aScrollY,
8075
uint32_t aMaxScrollX, uint32_t aMaxScrollY);

‎accessible/tests/mochitest/common.js

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ const nsIAccessibleScrollingEvent = Ci.nsIAccessibleScrollingEvent;
2424
const nsIAccessibleTextChangeEvent = Ci.nsIAccessibleTextChangeEvent;
2525
const nsIAccessibleTextSelectionChangeEvent =
2626
Ci.nsIAccessibleTextSelectionChangeEvent;
27-
const nsIAccessibleVirtualCursorChangeEvent =
28-
Ci.nsIAccessibleVirtualCursorChangeEvent;
2927
const nsIAccessibleObjectAttributeChangedEvent =
3028
Ci.nsIAccessibleObjectAttributeChangedEvent;
3129
const nsIAccessibleAnnouncementEvent = Ci.nsIAccessibleAnnouncementEvent;

‎accessible/windows/msaa/nsEventMap.h

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ static const uint32_t gWinEventMap[] = {
4747
kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_WINDOW_MINIMIZE
4848
kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_WINDOW_RESTORE
4949
IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED, // nsIAccessibleEvent::EVENT_OBJECT_ATTRIBUTE_CHANGED
50-
kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED
5150
EVENT_OBJECT_VALUECHANGE, // nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE
5251
kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_SCROLLING
5352
kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_ANNOUNCEMENT

0 commit comments

Comments
 (0)