Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ed8baebfeb78 (bug 1475087) for Windows build bustages on mozilla/a11y/DocAccessibleParent.h on a CLOSED TREE

Browse Source
This commit is contained in:
Gurzau Raul 2018-07-16 23:20:28 +03:00
parent 7dd15c8788
commit 117e86643a
17 changed files with 43 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accessible/base/AccEvent.cpp
View File

@ -187,14 +187,13 @@ AccVCChangeEvent::
int32_t aOldStart, int32_t aOldEnd,
Accessible* aNewAccessible,
int32_t aNewStart, int32_t aNewEnd,
int16_t aReason, int16_t aBoundaryType,
EIsFromUserInput aIsFromUserInput) :
int16_t aReason, EIsFromUserInput aIsFromUserInput) :
AccEvent(::nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED, aAccessible,
aIsFromUserInput),
mOldAccessible(aOldAccessible), mNewAccessible(aNewAccessible),
mOldStart(aOldStart), mNewStart(aNewStart),
mOldEnd(aOldEnd), mNewEnd(aNewEnd),
mReason(aReason), mBoundaryType(aBoundaryType)
mReason(aReason)
{
}
@ -259,8 +258,7 @@ a11y::MakeXPCEvent(AccEvent* aEvent)
ToXPC(vcc->NewAccessible()),
vcc->NewStartOffset(),
vcc->NewEndOffset(),
vcc->Reason(),
vcc->BoundaryType());
vcc->Reason());
return xpEvent.forget();
}

3
accessible/base/AccEvent.h
View File

@ -488,7 +488,6 @@ public:
Accessible* aNewAccessible,
int32_t aNewStart, int32_t aNewEnd,
int16_t aReason,
int16_t aBoundaryType,
EIsFromUserInput aIsFromUserInput = eFromUserInput);
virtual ~AccVCChangeEvent() { }
@ -508,7 +507,6 @@ public:
int32_t NewStartOffset() const { return mNewStart; }
int32_t NewEndOffset() const { return mNewEnd; }
int32_t Reason() const { return mReason; }
int32_t BoundaryType() const { return mBoundaryType; }
private:
RefPtr<Accessible> mOldAccessible;
@ -518,7 +516,6 @@ private:
int32_t mOldEnd;
int32_t mNewEnd;
int16_t mReason;
int16_t mBoundaryType;
};
/**

3
accessible/base/Platform.h
View File

@ -111,8 +111,7 @@ void ProxyVirtualCursorChangeEvent(ProxyAccessible* aTarget,
ProxyAccessible* aNewPosition,
int32_t aNewStartOffset,
int32_t aNewEndOffset,
int16_t aReason, int16_t aBoundaryType,
bool aFromUser);
uint16_t aReason, bool aFromUser);
#endif
} // namespace a11y
} // namespace mozilla

17
accessible/base/nsAccessiblePivot.cpp
View File

@ -103,8 +103,7 @@ nsAccessiblePivot::SetPosition(nsIAccessible* aPosition)
int32_t oldStart = mStartOffset, oldEnd = mEndOffset;
mStartOffset = mEndOffset = -1;
NotifyOfPivotChange(position, oldStart, oldEnd,
nsIAccessiblePivot::REASON_NONE,
nsIAccessiblePivot::NO_BOUNDARY, false);
nsIAccessiblePivot::REASON_NONE, false);
return NS_OK;
}
@ -187,8 +186,7 @@ nsAccessiblePivot::SetTextRange(nsIAccessibleText* aTextAccessible,
mPosition.swap(acc);
NotifyOfPivotChange(acc, oldStart, oldEnd,
nsIAccessiblePivot::REASON_NONE,
nsIAccessiblePivot::NO_BOUNDARY,
nsIAccessiblePivot::REASON_TEXT,
(aArgc > 0) ? aIsFromUserInput : true);
return NS_OK;
@ -420,7 +418,7 @@ nsAccessiblePivot::MoveNextByText(TextBoundaryType aBoundary,
mStartOffset = tempStart;
mEndOffset = tempEnd;
NotifyOfPivotChange(startPosition, oldStart, oldEnd,
nsIAccessiblePivot::REASON_NEXT, aBoundary,
nsIAccessiblePivot::REASON_TEXT,
(aArgc > 0) ? aIsFromUserInput : true);
return NS_OK;
}
@ -553,7 +551,7 @@ nsAccessiblePivot::MovePreviousByText(TextBoundaryType aBoundary,
mEndOffset = tempEnd;
NotifyOfPivotChange(startPosition, oldStart, oldEnd,
nsIAccessiblePivot::REASON_PREV, aBoundary,
nsIAccessiblePivot::REASON_TEXT,
(aArgc > 0) ? aIsFromUserInput : true);
return NS_OK;
}
@ -653,7 +651,7 @@ nsAccessiblePivot::MovePivotInternal(Accessible* aPosition,
mStartOffset = mEndOffset = -1;
return NotifyOfPivotChange(oldPosition, oldStart, oldEnd, aReason,
nsIAccessiblePivot::NO_BOUNDARY, aIsFromUserInput);
aIsFromUserInput);
}
Accessible*
@ -851,8 +849,7 @@ nsAccessiblePivot::SearchForText(Accessible* aAccessible, bool aBackward)
bool
nsAccessiblePivot::NotifyOfPivotChange(Accessible* aOldPosition,
int32_t aOldStart, int32_t aOldEnd,
int16_t aReason, int16_t aBoundaryType,
bool aIsFromUserInput)
int16_t aReason, bool aIsFromUserInput)
{
if (aOldPosition == mPosition &&
aOldStart == mStartOffset && aOldEnd == mEndOffset)
@ -865,7 +862,7 @@ nsAccessiblePivot::NotifyOfPivotChange(Accessible* aOldPosition,
obs->OnPivotChanged(this,
xpcOldPos, aOldStart, aOldEnd,
ToXPC(mPosition), mStartOffset, mEndOffset,
aReason, aBoundaryType, aIsFromUserInput);
aReason, aIsFromUserInput);
}
return true;

1
accessible/base/nsAccessiblePivot.h
View File

@ -53,7 +53,6 @@ private:
bool NotifyOfPivotChange(Accessible* aOldAccessible,
int32_t aOldStart, int32_t aOldEnd,
PivotMoveReason aReason,
TextBoundaryType aBoundaryType,
bool aIsFromUserInput);
/*

3
accessible/generic/Accessible.cpp
View File

@ -937,8 +937,7 @@ Accessible::HandleAccEvent(AccEvent* aEvent)
vcEvent->OldStartOffset(), vcEvent->OldEndOffset(),
position ? reinterpret_cast<uintptr_t>(position->UniqueID()) : 0,
vcEvent->NewStartOffset(), vcEvent->NewEndOffset(),
vcEvent->Reason(), vcEvent->BoundaryType(),
vcEvent->IsFromUserInput());
vcEvent->Reason(), vcEvent->IsFromUserInput());
break;
}
#if defined(XP_WIN)

4
accessible/generic/DocAccessible.cpp
View File

@ -683,7 +683,6 @@ DocAccessible::OnPivotChanged(nsIAccessiblePivot* aPivot,
nsIAccessible* aNewAccessible,
int32_t aNewStart, int32_t aNewEnd,
PivotMoveReason aReason,
TextBoundaryType aBoundaryType,
bool aIsFromUserInput)
{
RefPtr<AccEvent> event =
@ -692,8 +691,7 @@ DocAccessible::OnPivotChanged(nsIAccessiblePivot* aPivot,
aOldStart, aOldEnd,
(aNewAccessible ? aNewAccessible->ToInternalAccessible() : nullptr),
aNewStart, aNewEnd,
aReason, aBoundaryType,
aIsFromUserInput ? eFromUserInput : eNoUserInput);
aReason, aIsFromUserInput ? eFromUserInput : eNoUserInput);
nsEventShell::FireEvent(event);
return NS_OK;

5
accessible/interfaces/nsIAccessiblePivot.idl
View File

@ -23,7 +23,6 @@ interface nsIAccessiblePivotObserver;
[scriptable, uuid(81fe5144-059b-42db-bd3a-f6ce3158d5e9)]
interface nsIAccessiblePivot : nsISupports
{
const TextBoundaryType NO_BOUNDARY = -1;
const TextBoundaryType CHAR_BOUNDARY = 0;
const TextBoundaryType WORD_BOUNDARY = 1;
const TextBoundaryType LINE_BOUNDARY = 2;
@ -34,7 +33,8 @@ interface nsIAccessiblePivot : nsISupports
const PivotMoveReason REASON_PREV = 2;
const PivotMoveReason REASON_FIRST = 3;
const PivotMoveReason REASON_LAST = 4;
const PivotMoveReason REASON_POINT = 5;
const PivotMoveReason REASON_TEXT = 5;
const PivotMoveReason REASON_POINT = 6;
/**
* The accessible the pivot is currently pointed at.
@ -212,7 +212,6 @@ interface nsIAccessiblePivotObserver : nsISupports
in nsIAccessible aNewAccessible,
in long aNewStart, in long aNewEnd,
in PivotMoveReason aReason,
in TextBoundaryType aBoundaryType,
in boolean aIsFromUserInput);
};

5
accessible/interfaces/nsIAccessibleVirtualCursorChangeEvent.idl
View File

@ -46,9 +46,4 @@ interface nsIAccessibleVirtualCursorChangeEvent : nsIAccessibleEvent
* Reason for virtual cursor move.
*/
readonly attribute short reason;
/**
* Text boundary type for movement, NO_BOUNDARY if none.
*/
readonly attribute short boundaryType;
};

5
accessible/ipc/DocAccessibleParent.cpp
View File

@ -397,7 +397,6 @@ DocAccessibleParent::RecvVirtualCursorChangeEvent(const uint64_t& aID,
const int32_t& aNewStartOffset,
const int32_t& aNewEndOffset,
const int16_t& aReason,
const int16_t& aBoundaryType,
const bool& aFromUser)
{
ProxyAccessible* target = GetAccessible(aID);
@ -408,7 +407,7 @@ DocAccessibleParent::RecvVirtualCursorChangeEvent(const uint64_t& aID,
ProxyVirtualCursorChangeEvent(target,
newPosition, aOldStartOffset, aOldEndOffset,
oldPosition, aNewStartOffset, aNewEndOffset,
aReason, aBoundaryType, aFromUser);
aReason, aFromUser);
#endif
xpcAccessibleDocument* doc = GetAccService()->GetXPCDocument(this);
@ -420,7 +419,7 @@ DocAccessibleParent::RecvVirtualCursorChangeEvent(const uint64_t& aID,
aOldStartOffset, aOldEndOffset,
GetXPCAccessible(newPosition),
aNewStartOffset, aNewEndOffset,
aBoundaryType, aReason);
aReason);
nsCoreUtils::DispatchAccEvent(std::move(event));
return IPC_OK();

1
accessible/ipc/DocAccessibleParent.h
View File

@ -114,7 +114,6 @@ public:
const int32_t& aNewStartOffset,
const int32_t& aNewEndOffset,
const int16_t& aReason,
const int16_t& aBoundaryType,
const bool& aFromUser) override;
mozilla::ipc::IPCResult RecvRoleChangedEvent(const a11y::role& aRole) final;

3
accessible/ipc/other/PDocAccessible.ipdl
View File

@ -70,8 +70,7 @@ parent:
int32_t aOldStartOffset, int32_t aOldEndOffset,
uint64_t aPosition,
int32_t aStartOffset, int32_t aEndOffset,
int16_t aReason, int16_t aBoundaryType,
bool aFromUservcEvent);
int16_t aReason, bool aFromUservcEvent);
/*
* Tell the parent document to bind the existing document as a new child

5
accessible/jsat/ContentControl.jsm
View File

@ -474,9 +474,8 @@ this.ContentControl.prototype = {
if (aOptions.forcePresent) {
this._contentScope.get().sendAsyncMessage(
"AccessFu:Present", Presentation.pivotChanged(
vc.position, null, vc.startOffset, vc.endOffset,
Ci.nsIAccessiblePivot.REASON_NONE,
Ci.nsIAccessiblePivot.NO_BOUNDARY));
vc.position, null, Ci.nsIAccessiblePivot.REASON_NONE,
vc.startOffset, vc.endOffset));
}
};

5
accessible/jsat/EventManager.jsm
View File

@ -155,9 +155,8 @@ this.EventManager.prototype = {
}
this.present(
Presentation.pivotChanged(position, event.oldAccessible,
event.newStartOffset, event.newEndOffset,
event.reason, event.boundaryType));
Presentation.pivotChanged(position, event.oldAccessible, event.reason,
event.newStartOffset, event.newEndOffset));
break;
}

18
accessible/jsat/Presentation.jsm
View File

@ -36,10 +36,9 @@ class AndroidPresentor {
* position.
* @param {int} aReason the reason for the pivot change.
* See nsIAccessiblePivot.
* @param {bool} aBoundaryType the boundary type for the text movement
* or NO_BOUNDARY if it was not a text movement. See nsIAccessiblePivot.
* @param {bool} aIsFromUserInput the pivot change was invoked by the user
*/
pivotChanged(aPosition, aOldPosition, aStartOffset, aEndOffset, aReason, aBoundaryType) {
pivotChanged(aPosition, aOldPosition, aReason, aStartOffset, aEndOffset) {
let context = new PivotContext(
aPosition, aOldPosition, aStartOffset, aEndOffset);
if (!context.accessible) {
@ -56,7 +55,7 @@ class AndroidPresentor {
androidEvents.push({eventType: AndroidEvents.VIEW_HOVER_EXIT, text: []});
}
if (aBoundaryType != Ci.nsIAccessiblePivot.NO_BOUNDARY) {
if (aReason === Ci.nsIAccessiblePivot.REASON_TEXT) {
const adjustedText = context.textAndAdjustedOffsets;
androidEvents.push({
@ -206,6 +205,17 @@ class AndroidPresentor {
UtteranceGenerator.genForTabStateChange(aDocObj, aPageState));
}
/**
* The current tab has changed.
* @param {PivotContext} aDocContext context object for tab's
* document.
* @param {PivotContext} aVCContext context object for tab's current
* virtual cursor position.
*/
tabSelected(aDocContext, aVCContext) {
return this.pivotChanged(aVCContext, Ci.nsIAccessiblePivot.REASON_NONE);
}
/**
* The viewport has changed, either a scroll, pan, zoom, or
* landscape/portrait toggle.

2
accessible/other/Platform.cpp
View File

@ -64,7 +64,7 @@ a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t)
void
a11y::ProxyVirtualCursorChangeEvent(ProxyAccessible*, ProxyAccessible*,
int32_t, int32_t, ProxyAccessible*,
int32_t, int32_t, int16_t, int16_t, bool)
int32_t, int32_t, uint16_t, bool)
{
}
#endif

14
accessible/tests/mochitest/pivot.js
View File

@ -8,7 +8,6 @@ const PREFILTER_TRANSPARENT = nsIAccessibleTraversalRule.PREFILTER_TRANSPARENT;
const FILTER_MATCH = nsIAccessibleTraversalRule.FILTER_MATCH;
const FILTER_IGNORE = nsIAccessibleTraversalRule.FILTER_IGNORE;
const FILTER_IGNORE_SUBTREE = nsIAccessibleTraversalRule.FILTER_IGNORE_SUBTREE;
const NO_BOUNDARY = nsIAccessiblePivot.NO_BOUNDARY;
const CHAR_BOUNDARY = nsIAccessiblePivot.CHAR_BOUNDARY;
const WORD_BOUNDARY = nsIAccessiblePivot.WORD_BOUNDARY;
@ -72,7 +71,7 @@ var ObjectTraversalRule =
* A checker for virtual cursor changed events.
*/
function VCChangedChecker(aDocAcc, aIdOrNameOrAcc, aTextOffsets, aPivotMoveMethod,
aIsFromUserInput, aBoundaryType = NO_BOUNDARY) {
aIsFromUserInput) {
this.__proto__ = new invokerChecker(EVENT_VIRTUALCURSOR_CHANGED, aDocAcc);
this.match = function VCChangedChecker_match(aEvent) {
@ -86,8 +85,7 @@ function VCChangedChecker(aDocAcc, aIdOrNameOrAcc, aTextOffsets, aPivotMoveMetho
var expectedReason = VCChangedChecker.methodReasonMap[aPivotMoveMethod] ||
nsIAccessiblePivot.REASON_NONE;
return event.reason == expectedReason &&
event.boundaryType == aBoundaryType;
return event.reason == expectedReason;
};
this.check = function VCChangedChecker_check(aEvent) {
@ -160,9 +158,9 @@ VCChangedChecker.methodReasonMap = {
"movePrevious": nsIAccessiblePivot.REASON_PREV,
"moveFirst": nsIAccessiblePivot.REASON_FIRST,
"moveLast": nsIAccessiblePivot.REASON_LAST,
"setTextRange": nsIAccessiblePivot.REASON_NONE,
"moveNextByText": nsIAccessiblePivot.REASON_NEXT,
"movePreviousByText": nsIAccessiblePivot.REASON_PREV,
"setTextRange": nsIAccessiblePivot.REASON_TEXT,
"moveNextByText": nsIAccessiblePivot.REASON_TEXT,
"movePreviousByText": nsIAccessiblePivot.REASON_TEXT,
"moveToPoint": nsIAccessiblePivot.REASON_POINT
};
@ -290,7 +288,7 @@ function setVCTextInvoker(aDocAcc, aPivotMoveMethod, aBoundary, aTextOffsets,
if (expectMove) {
this.eventSeq = [
new VCChangedChecker(aDocAcc, aIdOrNameOrAcc, aTextOffsets, aPivotMoveMethod,
aIsFromUserInput === undefined ? true : aIsFromUserInput, aBoundary)
aIsFromUserInput === undefined ? true : aIsFromUserInput)
];
} else {
this.eventSeq = [];