Bug 1268544: Disable proxy code paths in accessible/xpcom pending resolution of
bug 1288839; r?tbsaunde
MozReview-Commit-ID: 3AAnFir6rnx
--- a/accessible/xpcom/xpcAccessible.cpp
+++ b/accessible/xpcom/xpcAccessible.cpp
@@ -190,26 +190,30 @@ xpcAccessible::GetDOMNode(nsIDOMNode** a
CallQueryInterface(node, aDOMNode);
return NS_OK;
}
NS_IMETHODIMP
xpcAccessible::GetId(nsAString& aID)
{
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
ProxyAccessible* proxy = IntlGeneric().AsProxy();
if (!proxy) {
return NS_ERROR_FAILURE;
}
nsString id;
proxy->DOMNodeID(id);
aID.Assign(id);
return NS_OK;
+#endif
}
NS_IMETHODIMP
xpcAccessible::GetDocument(nsIAccessibleDocument** aDocument)
{
NS_ENSURE_ARG_POINTER(aDocument);
*aDocument = nullptr;
@@ -473,22 +477,26 @@ xpcAccessible::GetRelationByType(uint32_
return NS_ERROR_FAILURE;
if (IntlGeneric().IsAccessible()) {
Relation rel = Intl()->RelationByType(static_cast<RelationType>(aType));
NS_ADDREF(*aRelation = new nsAccessibleRelation(aType, &rel));
return NS_OK;
}
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
ProxyAccessible* proxy = IntlGeneric().AsProxy();
nsTArray<ProxyAccessible*> targets =
proxy->RelationByType(static_cast<RelationType>(aType));
NS_ADDREF(*aRelation = new nsAccessibleRelation(aType, &targets));
return NS_OK;
+#endif
}
NS_IMETHODIMP
xpcAccessible::GetRelations(nsIArray** aRelations)
{
NS_ENSURE_ARG_POINTER(aRelations);
*aRelations = nullptr;
--- a/accessible/xpcom/xpcAccessibleHyperLink.cpp
+++ b/accessible/xpcom/xpcAccessibleHyperLink.cpp
@@ -16,69 +16,81 @@ xpcAccessibleHyperLink::GetStartIndex(in
NS_ENSURE_ARG_POINTER(aStartIndex);
*aStartIndex = 0;
if (Intl().IsNull())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible()) {
*aStartIndex = Intl().AsAccessible()->StartOffset();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
bool isIndexValid = false;
uint32_t startOffset = Intl().AsProxy()->StartOffset(&isIndexValid);
if (!isIndexValid)
return NS_ERROR_FAILURE;
*aStartIndex = startOffset;
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleHyperLink::GetEndIndex(int32_t* aEndIndex)
{
NS_ENSURE_ARG_POINTER(aEndIndex);
*aEndIndex = 0;
if (Intl().IsNull())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible()) {
*aEndIndex = Intl().AsAccessible()->EndOffset();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
bool isIndexValid = false;
uint32_t endOffset = Intl().AsProxy()->EndOffset(&isIndexValid);
if (!isIndexValid)
return NS_ERROR_FAILURE;
*aEndIndex = endOffset;
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleHyperLink::GetAnchorCount(int32_t* aAnchorCount)
{
NS_ENSURE_ARG_POINTER(aAnchorCount);
*aAnchorCount = 0;
if (Intl().IsNull())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible()) {
*aAnchorCount = Intl().AsAccessible()->AnchorCount();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
bool isCountValid = false;
uint32_t anchorCount = Intl().AsProxy()->AnchorCount(&isCountValid);
if (!isCountValid)
return NS_ERROR_FAILURE;
*aAnchorCount = anchorCount;
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleHyperLink::GetURI(int32_t aIndex, nsIURI** aURI)
{
@@ -91,27 +103,31 @@ xpcAccessibleHyperLink::GetURI(int32_t a
return NS_ERROR_INVALID_ARG;
if (Intl().IsAccessible()) {
if (aIndex >= static_cast<int32_t>(Intl().AsAccessible()->AnchorCount()))
return NS_ERROR_INVALID_ARG;
RefPtr<nsIURI>(Intl().AsAccessible()->AnchorURIAt(aIndex)).forget(aURI);
} else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
nsCString spec;
bool isURIValid = false;
Intl().AsProxy()->AnchorURIAt(aIndex, spec, &isURIValid);
if (!isURIValid)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), spec);
NS_ENSURE_SUCCESS(rv, rv);
uri.forget(aURI);
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleHyperLink::GetAnchor(int32_t aIndex, nsIAccessible** aAccessible)
@@ -126,17 +142,21 @@ xpcAccessibleHyperLink::GetAnchor(int32_
return NS_ERROR_INVALID_ARG;
if (Intl().IsAccessible()) {
if (aIndex >= static_cast<int32_t>(Intl().AsAccessible()->AnchorCount()))
return NS_ERROR_INVALID_ARG;
NS_IF_ADDREF(*aAccessible = ToXPC(Intl().AsAccessible()->AnchorAt(aIndex)));
} else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
NS_IF_ADDREF(*aAccessible = ToXPC(Intl().AsProxy()->AnchorAt(aIndex)));
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleHyperLink::GetValid(bool* aValid)
{
@@ -144,13 +164,17 @@ xpcAccessibleHyperLink::GetValid(bool* a
*aValid = false;
if (Intl().IsNull())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible()) {
*aValid = Intl().AsAccessible()->IsLinkValid();
} else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
*aValid = Intl().AsProxy()->IsLinkValid();
+#endif
}
return NS_OK;
}
--- a/accessible/xpcom/xpcAccessibleValue.cpp
+++ b/accessible/xpcom/xpcAccessibleValue.cpp
@@ -20,18 +20,22 @@ xpcAccessibleValue::GetMaximumValue(doub
return NS_ERROR_FAILURE;
if (Intl().IsAccessible() && Intl().AsAccessible()->IsDefunct())
return NS_ERROR_FAILURE;
double value;
if (Intl().IsAccessible()) {
value = Intl().AsAccessible()->MaxValue();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
value = Intl().AsProxy()->MaxValue();
+#endif
}
if (!IsNaN(value))
*aValue = value;
return NS_OK;
}
@@ -45,18 +49,22 @@ xpcAccessibleValue::GetMinimumValue(doub
return NS_ERROR_FAILURE;
if (Intl().IsAccessible() && Intl().AsAccessible()->IsDefunct())
return NS_ERROR_FAILURE;
double value;
if (Intl().IsAccessible()) {
value = Intl().AsAccessible()->MinValue();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
value = Intl().AsProxy()->MinValue();
+#endif
}
if (!IsNaN(value))
*aValue = value;
return NS_OK;
}
@@ -70,18 +78,22 @@ xpcAccessibleValue::GetCurrentValue(doub
return NS_ERROR_FAILURE;
if (Intl().IsAccessible() && Intl().AsAccessible()->IsDefunct())
return NS_ERROR_FAILURE;
double value;
if (Intl().IsAccessible()) {
value = Intl().AsAccessible()->CurValue();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
value = Intl().AsProxy()->CurValue();
+#endif
}
if (!IsNaN(value))
*aValue = value;
return NS_OK;
}
@@ -91,18 +103,22 @@ xpcAccessibleValue::SetCurrentValue(doub
if (Intl().IsNull())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible() && Intl().AsAccessible()->IsDefunct())
return NS_ERROR_FAILURE;
if (Intl().IsAccessible()) {
Intl().AsAccessible()->SetCurValue(aValue);
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
Intl().AsProxy()->SetCurValue(aValue);
+#endif
}
return NS_OK;
}
NS_IMETHODIMP
xpcAccessibleValue::GetMinimumIncrement(double* aValue)
{
@@ -113,17 +129,21 @@ xpcAccessibleValue::GetMinimumIncrement(
return NS_ERROR_FAILURE;
if (Intl().IsAccessible() && Intl().AsAccessible()->IsDefunct())
return NS_ERROR_FAILURE;
double value;
if (Intl().IsAccessible()) {
value = Intl().AsAccessible()->Step();
- } else {
+ } else {
+#if defined(XP_WIN)
+ return NS_ERROR_NOT_IMPLEMENTED;
+#else
value = Intl().AsProxy()->Step();
+#endif
}
if (!IsNaN(value))
*aValue = value;
return NS_OK;
}