From c2b1fcd31c9d00f0c9d85a568cbc00240dd9f38d Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Wed, 15 Aug 2018 04:39:43 +0300 Subject: [PATCH] Backed out changeset dad95d849302 (bug 1479591) for causing linux debug leaks and security issues. --- accessible/base/AccEvent.cpp | 7 --- accessible/base/AccEvent.h | 43 +-------------- accessible/base/Platform.h | 4 -- accessible/base/nsAccessibilityService.h | 1 - accessible/generic/Accessible.cpp | 8 --- accessible/generic/DocAccessible.cpp | 53 ++++++------------- accessible/generic/DocAccessible.h | 7 +-- accessible/interfaces/moz.build | 1 - accessible/interfaces/nsIAccessibleEvent.idl | 7 +-- .../nsIAccessibleScrollingEvent.idl | 34 ------------ accessible/ipc/DocAccessibleParent.cpp | 26 --------- accessible/ipc/DocAccessibleParent.h | 7 --- accessible/ipc/other/PDocAccessible.ipdl | 3 -- accessible/ipc/win/PDocAccessible.ipdl | 3 -- accessible/other/Platform.cpp | 5 -- accessible/tests/browser/events.js | 5 +- accessible/tests/browser/events/browser.ini | 1 - .../browser/events/browser_test_scrolling.js | 50 ----------------- accessible/tests/mochitest/common.js | 2 - accessible/windows/msaa/nsEventMap.h | 4 +- accessible/xpcom/AccEvents.conf | 3 +- 21 files changed, 24 insertions(+), 250 deletions(-) delete mode 100644 accessible/interfaces/nsIAccessibleScrollingEvent.idl delete mode 100644 accessible/tests/browser/events/browser_test_scrolling.js diff --git a/accessible/base/AccEvent.cpp b/accessible/base/AccEvent.cpp index 27d5e46ee4a1..b0046f2ff455 100644 --- a/accessible/base/AccEvent.cpp +++ b/accessible/base/AccEvent.cpp @@ -276,13 +276,6 @@ a11y::MakeXPCEvent(AccEvent* aEvent) return xpEvent.forget(); } - if (eventGroup & (1 << AccEvent::eScrollingEvent)) { - AccScrollingEvent* sa = downcast_accEvent(aEvent); - xpEvent = new xpcAccScrollingEvent(type, ToXPC(acc), ToXPCDocument(doc), node, - fromUser, sa->ScrollX(), sa->ScrollY(), - sa->MaxScrollX(), sa->MaxScrollY()); - } - xpEvent = new xpcAccEvent(type, ToXPC(acc), ToXPCDocument(doc), node, fromUser); return xpEvent.forget(); } diff --git a/accessible/base/AccEvent.h b/accessible/base/AccEvent.h index 57dce9ddfe51..f446bcb45b0e 100644 --- a/accessible/base/AccEvent.h +++ b/accessible/base/AccEvent.h @@ -104,8 +104,7 @@ public: eSelectionChangeEvent, eTableChangeEvent, eVirtualCursorChangeEvent, - eObjectAttrChangedEvent, - eScrollingEvent, + eObjectAttrChangedEvent }; static const EventGroup kEventGroup = eGenericEvent; @@ -548,46 +547,6 @@ private: virtual ~AccObjectAttrChangedEvent() { } }; -/** - * Accessible scroll event. - */ -class AccScrollingEvent : public AccEvent -{ -public: - AccScrollingEvent(uint32_t aEventType, Accessible* aAccessible, - uint32_t aScrollX, uint32_t aScrollY, - uint32_t aMaxScrollX, uint32_t aMaxScrollY) : - AccEvent(aEventType, aAccessible), - mScrollX(aScrollX), - mScrollY(aScrollY), - mMaxScrollX(aMaxScrollX), - mMaxScrollY(aMaxScrollY) { } - - virtual ~AccScrollingEvent() { } - - // AccEvent - static const EventGroup kEventGroup = eScrollingEvent; - virtual unsigned int GetEventGroups() const override - { - return AccEvent::GetEventGroups() | (1U << eScrollingEvent); - } - - // The X scrolling offset of the container when the event was fired. - uint32_t ScrollX() { return mScrollX; } - // The Y scrolling offset of the container when the event was fired. - uint32_t ScrollY() { return mScrollY; } - // The max X offset of the container. - uint32_t MaxScrollX() { return mMaxScrollX; } - // The max Y offset of the container. - uint32_t MaxScrollY() { return mMaxScrollY; } - -private: - uint32_t mScrollX; - uint32_t mScrollY; - uint32_t mMaxScrollX; - uint32_t mMaxScrollY; -}; - /** * Downcast the generic accessible event object to derived type. */ diff --git a/accessible/base/Platform.h b/accessible/base/Platform.h index 868489a7f739..980ed3f7d72f 100644 --- a/accessible/base/Platform.h +++ b/accessible/base/Platform.h @@ -113,10 +113,6 @@ void ProxyVirtualCursorChangeEvent(ProxyAccessible* aTarget, int32_t aNewEndOffset, int16_t aReason, int16_t aBoundaryType, bool aFromUser); - -void ProxyScrollingEvent(ProxyAccessible* aTarget, - uint32_t aScrollX, uint32_t aScrollY, - uint32_t aMaxScrollX, uint32_t aMaxScrollY); #endif } // namespace a11y } // namespace mozilla diff --git a/accessible/base/nsAccessibilityService.h b/accessible/base/nsAccessibilityService.h index e6243fda4abb..0288abf9519d 100644 --- a/accessible/base/nsAccessibilityService.h +++ b/accessible/base/nsAccessibilityService.h @@ -473,7 +473,6 @@ static const char kEventTypeNames[][40] = { "object attribute changed", // EVENT_OBJECT_ATTRIBUTE_CHANGED "virtual cursor changed", // EVENT_VIRTUALCURSOR_CHANGED "text value change", // EVENT_TEXT_VALUE_CHANGE - "scrolling", // EVENT_SCROLLING }; #endif diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index dd9bb8b58194..3962c427489d 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -952,14 +952,6 @@ Accessible::HandleAccEvent(AccEvent* aEvent) break; } #endif - case nsIAccessibleEvent::EVENT_SCROLLING_END: - case nsIAccessibleEvent::EVENT_SCROLLING: { - AccScrollingEvent* scrollingEvent = downcast_accEvent(aEvent); - ipcDoc->SendScrollingEvent(id, aEvent->GetEventType(), - scrollingEvent->ScrollX(), scrollingEvent->ScrollY(), - scrollingEvent->MaxScrollX(), scrollingEvent->MaxScrollY()); - break; - } default: ipcDoc->SendEvent(id, aEvent->GetEventType()); } diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp index 20fa9e042768..166d0b37862c 100644 --- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -610,10 +610,17 @@ DocAccessible::ScrollTimerCallback(nsITimer* aTimer, void* aClosure) { DocAccessible* docAcc = reinterpret_cast(aClosure); - if (docAcc) { - docAcc->DispatchScrollingEvent(nsIAccessibleEvent::EVENT_SCROLLING_END); + if (docAcc && docAcc->mScrollPositionChangedTicks && + ++docAcc->mScrollPositionChangedTicks > 2) { + // Whenever scroll position changes, mScrollPositionChangeTicks gets reset to 1 + // We only want to fire accessibilty scroll event when scrolling stops or pauses + // Therefore, we wait for no scroll events to occur between 2 ticks of this timer + // That indicates a pause in scrolling, so we fire the accessibilty scroll event + nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_SCROLLING_END, docAcc); + docAcc->mScrollPositionChangedTicks = 0; if (docAcc->mScrollWatchTimer) { + docAcc->mScrollWatchTimer->Cancel(); docAcc->mScrollWatchTimer = nullptr; NS_RELEASE(docAcc); // Release kung fu death grip } @@ -626,31 +633,24 @@ DocAccessible::ScrollTimerCallback(nsITimer* aTimer, void* aClosure) void DocAccessible::ScrollPositionDidChange(nscoord aX, nscoord aY) { - const uint32_t kScrollEventInterval = 100; - TimeStamp timestamp = TimeStamp::Now(); - if (mLastScrollingDispatch.IsNull() || - (timestamp - mLastScrollingDispatch).ToMilliseconds() >= kScrollEventInterval) { - DispatchScrollingEvent(nsIAccessibleEvent::EVENT_SCROLLING); - mLastScrollingDispatch = timestamp; - } - - // If timer callback is still pending, push it 100ms into the future. - // When scrolling ends and we don't fire this callback anymore, the - // timer callback will fire and dispatch an EVENT_SCROLLING_END. + // Start new timer, if the timer cycles at least 1 full cycle without more scroll position changes, + // then the ::Notify() method will fire the accessibility event for scroll position changes + const uint32_t kScrollPosCheckWait = 50; if (mScrollWatchTimer) { - mScrollWatchTimer->SetDelay(kScrollEventInterval); + mScrollWatchTimer->SetDelay(kScrollPosCheckWait); // Create new timer, to avoid leaks } else { NS_NewTimerWithFuncCallback(getter_AddRefs(mScrollWatchTimer), ScrollTimerCallback, this, - kScrollEventInterval, - nsITimer::TYPE_ONE_SHOT, + kScrollPosCheckWait, + nsITimer::TYPE_REPEATING_SLACK, "a11y::DocAccessible::ScrollPositionDidChange"); if (mScrollWatchTimer) { NS_ADDREF_THIS(); // Kung fu death grip } } + mScrollPositionChangedTicks = 1; } //////////////////////////////////////////////////////////////////////////////// @@ -2443,24 +2443,3 @@ DocAccessible::IsLoadEventTarget() const // It's content (not chrome) root document. return (treeItem->ItemType() == nsIDocShellTreeItem::typeContent); } - -void -DocAccessible::DispatchScrollingEvent(uint32_t aEventType) -{ - nsIScrollableFrame* sf = mPresShell->GetRootScrollFrameAsScrollable(); - - int32_t appUnitsPerDevPixel = mPresShell->GetPresContext()->AppUnitsPerDevPixel(); - LayoutDevicePoint scrollPoint = LayoutDevicePoint::FromAppUnits( - sf->GetScrollPosition(), appUnitsPerDevPixel) * mPresShell->GetResolution(); - - LayoutDeviceRect scrollRange = LayoutDeviceRect::FromAppUnits( - sf->GetScrollRange(), appUnitsPerDevPixel); - scrollRange.ScaleRoundOut(mPresShell->GetResolution()); - - RefPtr event = new AccScrollingEvent(aEventType, this, - scrollPoint.x, scrollPoint.y, - scrollRange.width, - scrollRange.height); - - nsEventShell::FireEvent(event); -} diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h index 39f14b811c08..3595e7092276 100644 --- a/accessible/generic/DocAccessible.h +++ b/accessible/generic/DocAccessible.h @@ -582,8 +582,6 @@ protected: */ static void ScrollTimerCallback(nsITimer* aTimer, void* aClosure); - void DispatchScrollingEvent(uint32_t aEventType); - protected: /** @@ -605,9 +603,8 @@ protected: mNodeToAccessibleMap; nsIDocument* mDocumentNode; - nsCOMPtr mScrollWatchTimer; - uint16_t mScrollPositionChangedTicks; // Used for tracking scroll events - TimeStamp mLastScrollingDispatch; + nsCOMPtr mScrollWatchTimer; + uint16_t mScrollPositionChangedTicks; // Used for tracking scroll events /** * Bit mask of document load states (@see LoadState). diff --git a/accessible/interfaces/moz.build b/accessible/interfaces/moz.build index 29c9c17014d1..b451dc336226 100644 --- a/accessible/interfaces/moz.build +++ b/accessible/interfaces/moz.build @@ -23,7 +23,6 @@ XPIDL_SOURCES += [ 'nsIAccessiblePivot.idl', 'nsIAccessibleRelation.idl', 'nsIAccessibleRole.idl', - 'nsIAccessibleScrollingEvent.idl', 'nsIAccessibleSelectable.idl', 'nsIAccessibleStateChangeEvent.idl', 'nsIAccessibleStates.idl', diff --git a/accessible/interfaces/nsIAccessibleEvent.idl b/accessible/interfaces/nsIAccessibleEvent.idl index 02b448f43d14..538d1d558b75 100644 --- a/accessible/interfaces/nsIAccessibleEvent.idl +++ b/accessible/interfaces/nsIAccessibleEvent.idl @@ -418,15 +418,10 @@ interface nsIAccessibleEvent : nsISupports */ const unsigned long EVENT_TEXT_VALUE_CHANGE = 0x0057; - /** - * An accessible's viewport is scrolling. - */ - const unsigned long EVENT_SCROLLING = 0x0058; - /** * Help make sure event map does not get out-of-line. */ - const unsigned long EVENT_LAST_ENTRY = 0x0059; + const unsigned long EVENT_LAST_ENTRY = 0x0058; /** * The type of event, based on the enumerated event values diff --git a/accessible/interfaces/nsIAccessibleScrollingEvent.idl b/accessible/interfaces/nsIAccessibleScrollingEvent.idl deleted file mode 100644 index 229d74579328..000000000000 --- a/accessible/interfaces/nsIAccessibleScrollingEvent.idl +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIAccessibleEvent.idl" - -/* - * An interface scroll events. - * Stores new scroll position and max scroll position. - */ -[scriptable, builtinclass, uuid(f75f0b32-5342-4d60-b1a5-b7bd6888eef5)] -interface nsIAccessibleScrollingEvent : nsIAccessibleEvent -{ - /** - * New X scroll position within a scrollable container in device pixels. - */ - readonly attribute unsigned long scrollX; - - /** - * New Y scroll position within a scrollable container in device pixels. - */ - readonly attribute unsigned long scrollY; - - /** - * Max X scroll position within a scrollable container in device pixels. - */ - readonly attribute unsigned long maxScrollX; - - /** - * Max Y scroll position within a scrollable container in device pixels. - */ - readonly attribute unsigned long maxScrollY; -}; diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp index 5457c41179b6..fda79806ac7d 100644 --- a/accessible/ipc/DocAccessibleParent.cpp +++ b/accessible/ipc/DocAccessibleParent.cpp @@ -426,32 +426,6 @@ DocAccessibleParent::RecvVirtualCursorChangeEvent(const uint64_t& aID, return IPC_OK(); } -mozilla::ipc::IPCResult -DocAccessibleParent::RecvScrollingEvent(const uint64_t& aID, - const uint64_t& aType, - const uint32_t& aScrollX, - const uint32_t& aScrollY, - const uint32_t& aMaxScrollX, - const uint32_t& aMaxScrollY) -{ - ProxyAccessible* target = GetAccessible(aID); - -#if defined(ANDROID) - ProxyScrollingEvent(target, aScrollX, aScrollY, aMaxScrollX, aMaxScrollY); -#endif - - xpcAccessibleGeneric* xpcAcc = GetXPCAccessible(target); - xpcAccessibleDocument* doc = GetAccService()->GetXPCDocument(this); - nsINode* node = nullptr; - bool fromUser = true; // XXX: Determine if this was from user input. - RefPtr event = - new xpcAccScrollingEvent(aType, xpcAcc, doc, node, fromUser, aScrollX, - aScrollY, aMaxScrollX, aMaxScrollY); - nsCoreUtils::DispatchAccEvent(std::move(event)); - - return IPC_OK(); -} - mozilla::ipc::IPCResult DocAccessibleParent::RecvRoleChangedEvent(const a11y::role& aRole) { diff --git a/accessible/ipc/DocAccessibleParent.h b/accessible/ipc/DocAccessibleParent.h index e53a5a2da2d0..ce5d3dccc4b7 100644 --- a/accessible/ipc/DocAccessibleParent.h +++ b/accessible/ipc/DocAccessibleParent.h @@ -117,13 +117,6 @@ public: const int16_t& aBoundaryType, const bool& aFromUser) override; - virtual mozilla::ipc::IPCResult RecvScrollingEvent(const uint64_t& aID, - const uint64_t& aType, - const uint32_t& aScrollX, - const uint32_t& aScrollY, - const uint32_t& aMaxScrollX, - const uint32_t& aMaxScrollY) override; - mozilla::ipc::IPCResult RecvRoleChangedEvent(const a11y::role& aRole) final; virtual mozilla::ipc::IPCResult RecvBindChildDoc(PDocAccessibleParent* aChildDoc, const uint64_t& aID) override; diff --git a/accessible/ipc/other/PDocAccessible.ipdl b/accessible/ipc/other/PDocAccessible.ipdl index 890ffe89eee4..392f41f1596c 100644 --- a/accessible/ipc/other/PDocAccessible.ipdl +++ b/accessible/ipc/other/PDocAccessible.ipdl @@ -72,9 +72,6 @@ parent: int32_t aStartOffset, int32_t aEndOffset, int16_t aReason, int16_t aBoundaryType, bool aFromUservcEvent); - async ScrollingEvent(uint64_t aID, uint64_t aType, - uint32_t aScrollX, uint32_t aScrollY, - uint32_t aMaxScrollX, uint32_t aMaxScrollY); /* * Tell the parent document to bind the existing document as a new child diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl index d6d58e60236d..f2816861a3e6 100644 --- a/accessible/ipc/win/PDocAccessible.ipdl +++ b/accessible/ipc/win/PDocAccessible.ipdl @@ -70,9 +70,6 @@ parent: int32_t aStartOffset, int32_t aEndOffset, int16_t aReason, int16_t aBoundaryType, bool aFromUservcEvent); - async ScrollingEvent(uint64_t aID, uint64_t aType, - uint32_t aScrollX, uint32_t aScrollY, - uint32_t aMaxScrollX, uint32_t aMaxScrollY); /* * Tell the parent document to bind the existing document as a new child diff --git a/accessible/other/Platform.cpp b/accessible/other/Platform.cpp index e7ebcf9ed058..f58f29577b78 100644 --- a/accessible/other/Platform.cpp +++ b/accessible/other/Platform.cpp @@ -67,9 +67,4 @@ a11y::ProxyVirtualCursorChangeEvent(ProxyAccessible*, ProxyAccessible*, int32_t, int32_t, int16_t, int16_t, bool) { } - -void -a11y::ProxyScrollingEvent(ProxyAccessible*, uint32_t, uint32_t, uint32_t, uint32_t) -{ -} #endif diff --git a/accessible/tests/browser/events.js b/accessible/tests/browser/events.js index e59deb576ae5..292cefc1a6cd 100644 --- a/accessible/tests/browser/events.js +++ b/accessible/tests/browser/events.js @@ -9,8 +9,7 @@ /* import-globals-from shared-head.js */ /* import-globals-from ../mochitest/common.js */ -/* exported EVENT_REORDER, EVENT_SCROLLING, EVENT_SCROLLING_END, EVENT_SHOW, - EVENT_TEXT_INSERTED, EVENT_TEXT_REMOVED, +/* exported EVENT_REORDER, EVENT_SHOW, EVENT_TEXT_INSERTED, EVENT_TEXT_REMOVED, EVENT_DOCUMENT_LOAD_COMPLETE, EVENT_HIDE, EVENT_TEXT_CARET_MOVED, EVENT_DESCRIPTION_CHANGE, EVENT_NAME_CHANGE, EVENT_STATE_CHANGE, EVENT_VALUE_CHANGE, EVENT_TEXT_VALUE_CHANGE, EVENT_FOCUS, @@ -21,8 +20,6 @@ const EVENT_DOCUMENT_LOAD_COMPLETE = nsIAccessibleEvent.EVENT_DOCUMENT_LOAD_COMPLETE; const EVENT_HIDE = nsIAccessibleEvent.EVENT_HIDE; const EVENT_REORDER = nsIAccessibleEvent.EVENT_REORDER; -const EVENT_SCROLLING = nsIAccessibleEvent.EVENT_SCROLLING; -const EVENT_SCROLLING_END = nsIAccessibleEvent.EVENT_SCROLLING_END; const EVENT_SHOW = nsIAccessibleEvent.EVENT_SHOW; const EVENT_STATE_CHANGE = nsIAccessibleEvent.EVENT_STATE_CHANGE; const EVENT_TEXT_CARET_MOVED = nsIAccessibleEvent.EVENT_TEXT_CARET_MOVED; diff --git a/accessible/tests/browser/events/browser.ini b/accessible/tests/browser/events/browser.ini index 11a0fd9a9281..c0ab92489026 100644 --- a/accessible/tests/browser/events/browser.ini +++ b/accessible/tests/browser/events/browser.ini @@ -7,7 +7,6 @@ support-files = [browser_test_docload.js] skip-if = e10s -[browser_test_scrolling.js] [browser_test_textcaret.js] [browser_test_focus_browserui.js] [browser_test_focus_dialog.js] diff --git a/accessible/tests/browser/events/browser_test_scrolling.js b/accessible/tests/browser/events/browser_test_scrolling.js deleted file mode 100644 index 9bd938aafb74..000000000000 --- a/accessible/tests/browser/events/browser_test_scrolling.js +++ /dev/null @@ -1,50 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -addAccessibleTask(` -
one
-
two
-
three
`, - async function(browser, accDoc) { - let onScrolling = waitForEvents([ - [EVENT_SCROLLING, accDoc], [EVENT_SCROLLING_END, accDoc]]); - await ContentTask.spawn(browser, null, () => { - content.location.hash = "#two"; - }); - let [scrollEvent1, scrollEndEvent1] = await onScrolling; - scrollEvent1.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEvent1.maxScrollY >= scrollEvent1.scrollY, "scrollY is within max"); - scrollEndEvent1.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEndEvent1.maxScrollY >= scrollEndEvent1.scrollY, - "scrollY is within max"); - - onScrolling = waitForEvents([ - [EVENT_SCROLLING, accDoc], [EVENT_SCROLLING_END, accDoc]]); - await ContentTask.spawn(browser, null, () => { - content.location.hash = "#three"; - }); - let [scrollEvent2, scrollEndEvent2] = await onScrolling; - scrollEvent2.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEvent2.scrollY > scrollEvent1.scrollY, - `${scrollEvent2.scrollY} > ${scrollEvent1.scrollY}`); - scrollEndEvent2.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEndEvent2.maxScrollY >= scrollEndEvent2.scrollY, - "scrollY is within max"); - - onScrolling = waitForEvents([ - [EVENT_SCROLLING, accDoc], [EVENT_SCROLLING_END, accDoc]]); - await ContentTask.spawn(browser, null, () => { - content.scrollTo(10, 0); - }); - let [scrollEvent3, scrollEndEvent3] = await onScrolling; - scrollEvent3.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEvent3.maxScrollX >= scrollEvent3.scrollX, "scrollX is within max"); - scrollEndEvent3.QueryInterface(nsIAccessibleScrollingEvent); - ok(scrollEndEvent3.maxScrollX >= scrollEndEvent3.scrollX, - "scrollY is within max"); - ok(scrollEvent3.scrollX > scrollEvent2.scrollX, - `${scrollEvent3.scrollX} > ${scrollEvent2.scrollX}`); - }); diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js index cd8c997478d5..35ad4fa3fd18 100644 --- a/accessible/tests/mochitest/common.js +++ b/accessible/tests/mochitest/common.js @@ -8,8 +8,6 @@ const nsIAccessibleStateChangeEvent = Ci.nsIAccessibleStateChangeEvent; const nsIAccessibleCaretMoveEvent = Ci.nsIAccessibleCaretMoveEvent; -const nsIAccessibleScrollingEvent = - Ci.nsIAccessibleScrollingEvent; const nsIAccessibleTextChangeEvent = Ci.nsIAccessibleTextChangeEvent; const nsIAccessibleVirtualCursorChangeEvent = diff --git a/accessible/windows/msaa/nsEventMap.h b/accessible/windows/msaa/nsEventMap.h index 08b3de2a930b..8af992e1c6f9 100644 --- a/accessible/windows/msaa/nsEventMap.h +++ b/accessible/windows/msaa/nsEventMap.h @@ -98,6 +98,6 @@ static const uint32_t gWinEventMap[] = { IA2_EVENT_HYPERTEXT_NLINKS_CHANGED, // nsIAccessibleEvent::EVENT_HYPERTEXT_NLINKS_CHANGED IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED, // nsIAccessibleEvent::EVENT_OBJECT_ATTRIBUTE_CHANGED kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED - EVENT_OBJECT_VALUECHANGE, // nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE - kEVENT_WIN_UNKNOWN, // nsIAccessibleEvent::EVENT_SCROLLING + EVENT_OBJECT_VALUECHANGE // nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE }; + diff --git a/accessible/xpcom/AccEvents.conf b/accessible/xpcom/AccEvents.conf index 7247a6d18820..0824bb78a0c2 100644 --- a/accessible/xpcom/AccEvents.conf +++ b/accessible/xpcom/AccEvents.conf @@ -14,6 +14,5 @@ simple_events = [ 'CaretMoveEvent', 'ObjectAttributeChangedEvent', 'TableChangeEvent', - 'VirtualCursorChangeEvent', - 'ScrollingEvent' + 'VirtualCursorChangeEvent' ]