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

Bug 1715230 part 6: Remove IsProxy() checks throughout the Windows a11y code. r=morgan

Browse Source 
Now that ProxyWrappers (RemoteAccessibleWrap and friends) are gone, IsProxy() can never be true, so checking it is pointless.

Differential Revision: https://phabricator.services.mozilla.com/D117536
This commit is contained in:
James Teh 2021-07-19 03:44:11 +00:00
parent 5aa62c8d87
commit ca92a8ae5a
7 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
accessible/windows/ia2/ia2Accessible.cpp
View File

@ -234,7 +234,6 @@ ia2Accessible::scrollToPoint(enum IA2CoordinateType aCoordType, long aX,
? nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE
: nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE;
MOZ_ASSERT(!acc->IsProxy());
acc->ScrollToPoint(geckoCoordType, aX, aY);
return S_OK;
@ -289,7 +288,6 @@ ia2Accessible::get_states(AccessibleStates* aStates) {
}
uint64_t state;
MOZ_ASSERT(!acc->IsProxy());
state = acc->State();
if (state & states::INVALID) *aStates |= IA2_STATE_INVALID_ENTRY;
@ -468,13 +466,8 @@ ia2Accessible::get_attributes(BSTR* aAttributes) {
// The format is name:value;name:value; with \ for escaping these
// characters ":;=,\".
if (!acc->IsProxy()) {
RefPtr<AccAttributes> attributes = acc->Attributes();
return ConvertToIA2Attributes(attributes, aAttributes);
}
MOZ_ASSERT(!acc->IsProxy());
return E_UNEXPECTED;
RefPtr<AccAttributes> attributes = acc->Attributes();
return ConvertToIA2Attributes(attributes, aAttributes);
}
////////////////////////////////////////////////////////////////////////////////
@ -546,7 +539,6 @@ ia2Accessible::get_relationTargetsOfType(BSTR aType, long aMaxTargets,
}
nsTArray<LocalAccessible*> targets;
MOZ_ASSERT(!acc->IsProxy());
Relation rel = acc->RelationByType(*relationType);
LocalAccessible* target = nullptr;
while (

2
accessible/windows/ia2/ia2AccessibleAction.cpp
View File

@ -26,7 +26,7 @@ ia2AccessibleAction::QueryInterface(REFIID iid, void** ppv) {
*ppv = nullptr;
if (IID_IAccessibleAction == iid && LocalAcc() && !LocalAcc()->IsProxy()) {
if (IID_IAccessibleAction == iid && LocalAcc()) {
*ppv = static_cast<IAccessibleAction*>(this);
(reinterpret_cast<IUnknown*>(*ppv))->AddRef();
return S_OK;

5
accessible/windows/ia2/ia2AccessibleEditableText.cpp
View File

@ -29,7 +29,6 @@ STDMETHODIMP
ia2AccessibleEditableText::copyText(long aStartOffset, long aEndOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartOffset, aEndOffset)) return E_INVALIDARG;
@ -41,7 +40,6 @@ STDMETHODIMP
ia2AccessibleEditableText::deleteText(long aStartOffset, long aEndOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartOffset, aEndOffset)) return E_INVALIDARG;
@ -56,7 +54,6 @@ ia2AccessibleEditableText::insertText(long aOffset, BSTR* aText) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidOffset(aOffset)) return E_INVALIDARG;
@ -68,7 +65,6 @@ STDMETHODIMP
ia2AccessibleEditableText::cutText(long aStartOffset, long aEndOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartOffset, aEndOffset)) return E_INVALIDARG;
@ -80,7 +76,6 @@ STDMETHODIMP
ia2AccessibleEditableText::pasteText(long aOffset) {
RefPtr<HyperTextAccessible> textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidOffset(aOffset)) return E_INVALIDARG;

8
accessible/windows/ia2/ia2AccessibleHyperlink.cpp
View File

@ -28,8 +28,7 @@ ia2AccessibleHyperlink::QueryInterface(REFIID iid, void** ppv) {
if (IID_IAccessibleHyperlink == iid) {
auto accWrap = LocalAcc();
if (!accWrap || (accWrap->IsProxy() ? !accWrap->Proxy()->IsLink()
: !accWrap->IsLink())) {
if (!accWrap || !accWrap->IsLink()) {
return E_NOINTERFACE;
}
@ -53,7 +52,6 @@ ia2AccessibleHyperlink::get_anchor(long aIndex, VARIANT* aAnchor) {
if (!thisObj) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!thisObj->IsProxy());
if (aIndex < 0 || aIndex >= static_cast<long>(thisObj->AnchorCount()))
return E_INVALIDARG;
@ -84,7 +82,6 @@ ia2AccessibleHyperlink::get_anchorTarget(long aIndex, VARIANT* aAnchorTarget) {
return CO_E_OBJNOTCONNECTED;
}
nsAutoCString uriStr;
MOZ_ASSERT(!thisObj->IsProxy());
if (aIndex < 0 || aIndex >= static_cast<long>(thisObj->AnchorCount())) {
return E_INVALIDARG;
@ -123,7 +120,6 @@ ia2AccessibleHyperlink::get_startIndex(long* aIndex) {
if (!thisObj) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!thisObj->IsProxy());
if (!thisObj->IsLink()) return S_FALSE;
@ -141,7 +137,6 @@ ia2AccessibleHyperlink::get_endIndex(long* aIndex) {
if (!thisObj) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!thisObj->IsProxy());
if (!thisObj->IsLink()) return S_FALSE;
@ -159,7 +154,6 @@ ia2AccessibleHyperlink::get_valid(boolean* aValid) {
if (!thisObj) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!thisObj->IsProxy());
if (!thisObj->IsLink()) return S_FALSE;

4
accessible/windows/ia2/ia2AccessibleHypertext.cpp
View File

@ -57,7 +57,6 @@ ia2AccessibleHypertext::get_nHyperlinks(long* aHyperlinkCount) {
HyperTextAccessibleWrap* hyperText = TextAcc();
if (!hyperText) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!hyperText->IsProxy());
*aHyperlinkCount = hyperText->LinkCount();
return S_OK;
@ -75,7 +74,6 @@ ia2AccessibleHypertext::get_hyperlink(long aLinkIndex,
if (!hyperText) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!hyperText->IsProxy());
hyperLink = hyperText->LinkAt(aLinkIndex);
@ -98,7 +96,6 @@ ia2AccessibleHypertext::get_hyperlinkIndex(long aCharIndex,
HyperTextAccessibleWrap* hyperAcc = TextAcc();
if (!hyperAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!hyperAcc->IsProxy());
*aHyperlinkIndex = hyperAcc->LinkIndexAtOffset(aCharIndex);
return S_OK;
@ -118,7 +115,6 @@ ia2AccessibleHypertext::get_hyperlinks(IAccessibleHyperlink*** aHyperlinks,
if (!hyperText) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!hyperText->IsProxy());
uint32_t count = hyperText->LinkCount();
*aNHyperlinks = count;

14
accessible/windows/ia2/ia2AccessibleText.cpp
View File

@ -35,7 +35,6 @@ STDMETHODIMP
ia2AccessibleText::addSelection(long aStartOffset, long aEndOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
return textAcc->AddToSelection(aStartOffset, aEndOffset) ? S_OK
: E_INVALIDARG;
@ -56,7 +55,6 @@ ia2AccessibleText::get_attributes(long aOffset, long* aStartOffset,
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
RefPtr<AccAttributes> attributes =
textAcc->TextAttributes(true, aOffset, &startOffset, &endOffset);
@ -80,7 +78,6 @@ ia2AccessibleText::get_caretOffset(long* aOffset) {
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
*aOffset = textAcc->CaretOffset();
@ -102,7 +99,6 @@ ia2AccessibleText::get_characterExtents(long aOffset,
nsIntRect rect;
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
rect = textAcc->CharBounds(aOffset, geckoCoordType);
@ -123,7 +119,6 @@ ia2AccessibleText::get_nSelections(long* aNSelections) {
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
*aNSelections = textAcc->SelectionCount();
@ -146,7 +141,6 @@ ia2AccessibleText::get_offsetAtPoint(long aX, long aY,
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
*aOffset = textAcc->OffsetAtPoint(aX, aY, geckoCoordType);
@ -164,7 +158,6 @@ ia2AccessibleText::get_selection(long aSelectionIndex, long* aStartOffset,
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->SelectionBoundsAt(aSelectionIndex, &startOffset, &endOffset)) {
return E_INVALIDARG;
@ -186,7 +179,6 @@ ia2AccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR* aText) {
if (!textAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartOffset, aEndOffset)) {
return E_INVALIDARG;
@ -319,7 +311,6 @@ STDMETHODIMP
ia2AccessibleText::removeSelection(long aSelectionIndex) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
return textAcc->RemoveFromSelection(aSelectionIndex) ? S_OK : E_INVALIDARG;
}
@ -328,7 +319,6 @@ STDMETHODIMP
ia2AccessibleText::setCaretOffset(long aOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidOffset(aOffset)) return E_INVALIDARG;
@ -341,7 +331,6 @@ ia2AccessibleText::setSelection(long aSelectionIndex, long aStartOffset,
long aEndOffset) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
return textAcc->SetSelectionBoundsAt(aSelectionIndex, aStartOffset,
aEndOffset)
@ -356,7 +345,6 @@ ia2AccessibleText::get_nCharacters(long* aNCharacters) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
*aNCharacters = textAcc->CharacterCount();
return S_OK;
@ -367,7 +355,6 @@ ia2AccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex,
enum IA2ScrollType aScrollType) {
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartIndex, aEndIndex)) return E_INVALIDARG;
@ -386,7 +373,6 @@ ia2AccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex,
HyperTextAccessible* textAcc = TextAcc();
if (!textAcc) return CO_E_OBJNOTCONNECTED;
MOZ_ASSERT(!textAcc->IsProxy());
if (!textAcc->IsValidRange(aStartIndex, aEndIndex)) return E_INVALIDARG;

4
accessible/windows/ia2/ia2AccessibleValue.cpp
View File

@ -56,7 +56,6 @@ ia2AccessibleValue::get_currentValue(VARIANT* aCurrentValue) {
return CO_E_OBJNOTCONNECTED;
}
double currentValue;
MOZ_ASSERT(!valueAcc->IsProxy());
currentValue = valueAcc->CurValue();
@ -75,7 +74,6 @@ ia2AccessibleValue::setCurrentValue(VARIANT aValue) {
if (!valueAcc) {
return CO_E_OBJNOTCONNECTED;
}
MOZ_ASSERT(!valueAcc->IsProxy());
return valueAcc->SetCurValue(aValue.dblVal) ? S_OK : E_FAIL;
}
@ -91,7 +89,6 @@ ia2AccessibleValue::get_maximumValue(VARIANT* aMaximumValue) {
return CO_E_OBJNOTCONNECTED;
}
double maximumValue;
MOZ_ASSERT(!valueAcc->IsProxy());
maximumValue = valueAcc->MaxValue();
@ -113,7 +110,6 @@ ia2AccessibleValue::get_minimumValue(VARIANT* aMinimumValue) {
return CO_E_OBJNOTCONNECTED;
}
double minimumValue;
MOZ_ASSERT(!valueAcc->IsProxy());
minimumValue = valueAcc->MinValue();