import change from `dev' branch of rmottola/Arctic-Fox:

- goanna -> gecko (cac9263ee)
AppConstants
Roy Tam 2 years ago
parent c7f8abfdb0
commit 30dd322d5a
  1. 6
      accessible/atk/AccessibleWrap.cpp
  2. 12
      accessible/atk/ApplicationAccessibleWrap.cpp
  3. 2
      accessible/atk/UtilInterface.cpp
  4. 6
      accessible/base/Asserts.cpp
  5. 2
      accessible/base/RelationTypeMap.h
  6. 6
      accessible/base/nsAccessibilityService.cpp
  7. 2
      accessible/generic/ApplicationAccessible.cpp
  8. 2
      accessible/generic/ApplicationAccessible.h
  9. 2
      accessible/generic/HyperTextAccessible.cpp
  10. 2
      accessible/interfaces/ia2/moz.build
  11. 2
      accessible/interfaces/msaa/ISimpleDOMNode.idl
  12. 2
      accessible/interfaces/msaa/moz.build
  13. 2
      accessible/interfaces/nsIAccessibleDocument.idl
  14. 2
      accessible/interfaces/nsIAccessibleRole.idl
  15. 2
      accessible/ipc/DocAccessibleChild.cpp
  16. 6
      accessible/jsat/AccessFu.jsm
  17. 4
      accessible/mac/Platform.mm
  18. 10
      accessible/mac/mozAccessible.h
  19. 90
      accessible/mac/mozAccessible.mm
  20. 24
      accessible/mac/mozActionElements.mm
  21. 4
      accessible/mac/mozDocAccessible.mm
  22. 18
      accessible/mac/mozHTMLAccessible.mm
  23. 4
      accessible/mac/mozTextAccessible.h
  24. 82
      accessible/mac/mozTextAccessible.mm
  25. 4
      accessible/tests/mochitest/elm/test_nsApplicationAcc.html
  26. 2
      accessible/tests/mochitest/events/test_valuechange.html
  27. 4
      accessible/tests/mochitest/role/test_general.html
  28. 2
      accessible/windows/ia2/ia2Accessible.cpp
  29. 4
      accessible/windows/ia2/ia2AccessibleRelation.cpp
  30. 6
      accessible/windows/ia2/ia2AccessibleRelation.h
  31. 8
      accessible/windows/ia2/ia2AccessibleText.cpp
  32. 2
      accessible/windows/ia2/ia2AccessibleText.h
  33. 10
      accessible/windows/msaa/AccessibleWrap.cpp
  34. 2
      accessible/windows/msaa/AccessibleWrap.h
  35. 2
      accessible/windows/msaa/HTMLWin32ObjectAccessible.h
  36. 2
      b2g/app/B2GLoader.cpp
  37. 2
      b2g/app/b2g.js
  38. 2
      b2g/app/macbuild/Contents/Info.plist.in
  39. 4
      b2g/app/moz.build
  40. 2
      b2g/app/nsBrowserApp.cpp
  41. 4
      b2g/app/ua-update.json.in
  42. 2
      b2g/chrome/content/devtools/debugger.js
  43. 6
      b2g/chrome/content/identity.js
  44. 22
      b2g/chrome/content/settings.js
  45. 2
      b2g/components/LogShake.jsm
  46. 2
      b2g/components/SystemAppProxy.jsm
  47. 6
      b2g/components/UpdatePrompt.js
  48. 6
      b2g/config/dolphin-512/config.json
  49. 6
      b2g/config/dolphin/config.json
  50. 2
      b2g/config/emulator-ics/config.json
  51. 2
      b2g/config/emulator-jb/config.json
  52. 2
      b2g/config/emulator-kk/config.json
  53. 2
      b2g/config/emulator/config.json
  54. 6
      b2g/config/flame-kk/config.json
  55. 6
      b2g/config/flame/config.json
  56. 6
      b2g/config/hamachi/config.json
  57. 2
      b2g/config/hamachi/limited-memory-config.json
  58. 6
      b2g/config/helix/config.json
  59. 6
      b2g/config/nexus-4/config.json
  60. 6
      b2g/config/nexus-5-l/config.json
  61. 6
      b2g/config/wasabi/config.json
  62. 2
      b2g/confvars.sh
  63. 2
      b2g/locales/Makefile.in
  64. 2
      browser/app/macbuild/Contents/Info.plist.in
  65. 4
      browser/app/moz.build
  66. 2
      browser/base/content/browser-fullScreen.js
  67. 2
      browser/base/content/browser.js
  68. 2
      browser/components/feeds/WebContentConverter.js
  69. 4
      browser/components/nsBrowserContentHandler.js
  70. 2
      browser/components/nsBrowserGlue.js
  71. 2
      browser/installer/windows/nsis/shared.nsh
  72. 22
      browser/locales/en-US/chrome/browser-region/region.properties
  73. 4
      browser/locales/filter.py
  74. 2
      build/annotationProcessors/AnnotationInfo.java
  75. 10
      build/annotationProcessors/AnnotationProcessor.java
  76. 8
      build/annotationProcessors/CodeGenerator.java
  77. 12
      build/annotationProcessors/SDKProcessor.java
  78. 4
      build/annotationProcessors/classloader/AnnotatableEntity.java
  79. 2
      build/annotationProcessors/classloader/ClassWithOptions.java
  80. 2
      build/annotationProcessors/classloader/IterableJarLoadingURLClassLoader.java
  81. 2
      build/annotationProcessors/classloader/JarClassIterator.java
  82. 2
      build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
  83. 10
      build/annotationProcessors/utils/GeneratableElementIterator.java
  84. 4
      build/annotationProcessors/utils/Utils.java
  85. 6
      build/appini_header.py
  86. 2
      build/application.ini
  87. 2
      build/autoconf/config.status.m4
  88. 26
      build/docs/defining-binaries.rst
  89. 4
      build/docs/preprocessor.rst
  90. 48
      build/gecko_templates.mozbuild
  91. 2
      build/mobile/b2gautomation.py
  92. 12
      build/mobile/robocop/Actions.java
  93. 6
      build/mobile/robocop/AndroidManifest.xml.in
  94. 2
      build/mobile/robocop/Assert.java
  95. 10
      build/mobile/robocop/Driver.java
  96. 2
      build/mobile/robocop/Element.java
  97. 2
      build/mobile/robocop/FennecInstrumentationTestRunner.java
  98. 2
      build/mobile/robocop/FennecMochitestAssert.java
  99. 16
      build/mobile/robocop/FennecNativeActions.java
  100. 72
      build/mobile/robocop/FennecNativeDriver.java
  101. Some files were not shown because too many files have changed in this diff Show More

@ -966,7 +966,7 @@ refRelationSetCB(AtkObject *aAtkObj)
ATK_OBJECT_CLASS(parent_class)->ref_relation_set(aAtkObj);
const AtkRelationType typeMap[] = {
#define RELATIONTYPE(goanna, s, atk, m, i) atk,
#define RELATIONTYPE(gecko, s, atk, m, i) atk,
#include "RelationTypeMap.h"
#undef RELATIONTYPE
};
@ -1003,8 +1003,8 @@ refRelationSetCB(AtkObject *aAtkObj)
if (!accWrap)
return relation_set;
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
UpdateAtkRelation(RelationType::goannaType, accWrap, atkType, relation_set);
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
UpdateAtkRelation(RelationType::geckoType, accWrap, atkType, relation_set);
#include "RelationTypeMap.h"

@ -36,10 +36,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
const GValue* param_values,
gpointer data)
{
static GQuark sQuark_goanna_acc_obj = 0;
static GQuark sQuark_gecko_acc_obj = 0;
if (!sQuark_goanna_acc_obj)
sQuark_goanna_acc_obj = g_quark_from_static_string("GoannaAccObj");
if (!sQuark_gecko_acc_obj)
sQuark_gecko_acc_obj = g_quark_from_static_string("GeckoAccObj");
if (nsAccessibilityService::IsShutdown())
return TRUE;
@ -58,7 +58,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
// Attach the dialog accessible to app accessible tree
Accessible* windowAcc = GetAccService()->AddNativeRootAccessible(child);
g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj,
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj,
reinterpret_cast<gpointer>(windowAcc));
} else {
@ -66,10 +66,10 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
// Deattach the dialog accessible
Accessible* windowAcc =
reinterpret_cast<Accessible*>
(g_object_get_qdata(G_OBJECT(child), sQuark_goanna_acc_obj));
(g_object_get_qdata(G_OBJECT(child), sQuark_gecko_acc_obj));
if (windowAcc) {
GetAccService()->RemoveNativeRootAccessible(windowAcc);
g_object_set_qdata(G_OBJECT(child), sQuark_goanna_acc_obj, nullptr);
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, nullptr);
}
}

@ -20,7 +20,7 @@ typedef AtkUtil MaiUtil;
typedef AtkUtilClass MaiUtilClass;
#define MAI_VERSION MOZILLA_VERSION
#define MAI_NAME "Goanna"
#define MAI_NAME "Gecko"
extern "C" {
static guint (*gail_add_global_event_listener)(GSignalEmissionHook listener,

@ -18,9 +18,9 @@ using namespace mozilla::a11y;
#include "RoleMap.h"
#undef ROLE
#define RELATIONTYPE(goannaType, stringType, atkType, msaaType, ia2Type) \
static_assert(static_cast<uint32_t>(RelationType::goannaType) \
== static_cast<uint32_t>(nsIAccessibleRelation::RELATION_ ## goannaType), \
#define RELATIONTYPE(geckoType, stringType, atkType, msaaType, ia2Type) \
static_assert(static_cast<uint32_t>(RelationType::geckoType) \
== static_cast<uint32_t>(nsIAccessibleRelation::RELATION_ ## geckoType), \
"internal and xpcom relations differ!");
#include "RelationTypeMap.h"
#undef RELATIONTYPE

@ -6,7 +6,7 @@
/**
* Usage: declare the macro RELATIONTYPE()with the following arguments:
* RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type)
* RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type)
*/
RELATIONTYPE(LABELLED_BY,

@ -844,9 +844,9 @@ nsAccessibilityService::GetStringRelationType(uint32_t aRelationType,
{
NS_ENSURE_ARG(aRelationType <= static_cast<uint32_t>(RelationType::LAST));
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
case RelationType::goannaType: \
aString.AssignLiteral(goannaTypeName); \
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
case RelationType::geckoType: \
aString.AssignLiteral(geckoTypeName); \
return NS_OK;
RelationType relationType = static_cast<RelationType>(aRelationType);

@ -58,7 +58,7 @@ ApplicationAccessible::Name(nsString& aName)
getter_Copies(appName));
if (NS_FAILED(rv) || appName.IsEmpty()) {
NS_WARNING("brandShortName not found, using default app name");
appName.AssignLiteral("Goanna based application");
appName.AssignLiteral("Gecko based application");
}
aName.Assign(appName);

@ -74,7 +74,7 @@ public:
void PlatformName(nsAString& aName) const
{
aName.AssignLiteral("Goanna");
aName.AssignLiteral("Gecko");
}
void PlatformVersion(nsAString& aVersion) const

@ -1317,7 +1317,7 @@ HyperTextAccessible::GetCaretRect(nsIWidget** aWidget)
// Correct for character size, so that caret always matches the size of
// the character. This is important for font size transitions, and is
// necessary because the Goanna caret uses the previous character's size as
// necessary because the Gecko caret uses the previous character's size as
// the user moves forward in the text by character.
nsIntRect charRect = CharBounds(CaretOffset(),
nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE);

@ -4,7 +4,7 @@
# 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/.
GoannaSharedLibrary('IA2Marshal', linkage=None)
GeckoSharedLibrary('IA2Marshal', linkage=None)
DEFINES['REGISTER_PROXY_DLL'] = True

@ -84,7 +84,7 @@ cpp_quote("//")
cpp_quote("//")
cpp_quote("// get_localInterface(/* [out] */ void **localInterface);")
cpp_quote("// ---------------------------------------------------------------------------------------------------=")
cpp_quote("// Only available in Goanna's process")
cpp_quote("// Only available in Gecko's process")
cpp_quote("//")
cpp_quote("//")
cpp_quote("// get_language(/* [out] */ BSTR *htmlText);")

@ -4,7 +4,7 @@
# 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/.
GoannaSharedLibrary('AccessibleMarshal', linkage=None)
GeckoSharedLibrary('AccessibleMarshal', linkage=None)
GENERATED_SOURCES += [
'dlldata.c',

@ -12,7 +12,7 @@ interface nsIDOMWindow;
/**
* An interface for in-process accessibility clients
* that wish to retrieve information about a document.
* When accessibility is turned on in Goanna,
* When accessibility is turned on in Gecko,
* there is an nsIAccessibleDocument for each document
* whether it is XUL, HTML or whatever.
* You can QueryInterface to nsIAccessibleDocument from the nsIAccessible for

@ -6,7 +6,7 @@
#include "nsISupports.idl"
/**
* Defines cross platform (Goanna) roles.
* Defines cross platform (Gecko) roles.
*/
[scriptable, uuid(55581ec3-ba6e-4805-8108-260ed34cdcbb)]
interface nsIAccessibleRole : nsISupports

@ -244,7 +244,7 @@ DocAccessibleChild::RecvRelations(const uint64_t& aID,
if (!aID)
return false;
#define RELATIONTYPE(goanna, s, a, m, i) AddRelation(acc, RelationType::goanna, aRelations);
#define RELATIONTYPE(gecko, s, a, m, i) AddRelation(acc, RelationType::gecko, aRelations);
#include "RelationTypeMap.h"
#undef RELATIONTYPE

@ -33,7 +33,7 @@ this.AccessFu = { // jshint ignore:line
Utils.init(aWindow);
try {
Services.androidBridge.handleGoannaMessage(
Services.androidBridge.handleGeckoMessage(
{ type: 'Accessibility:Ready' });
Services.obs.addObserver(this, 'Accessibility:Settings', false);
} catch (x) {
@ -611,7 +611,7 @@ var Output = {
androidEvent.brailleOutput);
break;
}
this.androidBridge.handleGoannaMessage(androidEvent);
this.androidBridge.handleGeckoMessage(androidEvent);
}
},
@ -801,7 +801,7 @@ var Input = {
if (Utils.MozBuildApp == 'mobile/android') {
// Return focus to native Android browser chrome.
Services.androidBridge.handleGoannaMessage(
Services.androidBridge.handleGeckoMessage(
{ type: 'ToggleChrome:Focus' });
}
break;

@ -50,11 +50,11 @@ ProxyEvent(ProxyAccessible*, uint32_t)
}
}
@interface GoannaNSApplication(a11y)
@interface GeckoNSApplication(a11y)
-(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute;
@end
@implementation GoannaNSApplication(a11y)
@implementation GeckoNSApplication(a11y)
-(void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute
{

@ -24,7 +24,7 @@ GetObjectOrRepresentedView(id <mozAccessible> aObject)
}
inline mozAccessible*
GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
GetNativeFromGeckoAccessible(mozilla::a11y::Accessible* aAccessible)
{
mozAccessible* native = nil;
aAccessible->GetNativeInterface((void**)&native);
@ -36,7 +36,7 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
/**
* Weak reference; it owns us.
*/
mozilla::a11y::AccessibleWrap* mGoannaAccessible;
mozilla::a11y::AccessibleWrap* mGeckoAccessible;
/**
* Strong ref to array of children
@ -49,13 +49,13 @@ GetNativeFromGoannaAccessible(mozilla::a11y::Accessible* aAccessible)
mozAccessible* mParent;
/**
* The role of our goanna accessible.
* The role of our gecko accessible.
*/
mozilla::a11y::role mRole;
}
// inits with the goanna owner.
- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)goannaParent;
// inits with the gecko owner.
- (id)initWithAccessible:(mozilla::a11y::AccessibleWrap*)geckoParent;
// our accessible parent (AXParent)
- (id <mozAccessible>)parent;

@ -60,13 +60,13 @@ GetClosestInterestingAccessible(id anObject)
@implementation mozAccessible
- (id)initWithAccessible:(AccessibleWrap*)goannaAccessible
- (id)initWithAccessible:(AccessibleWrap*)geckoAccessible
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if ((self = [super init])) {
mGoannaAccessible = goannaAccessible;
mRole = goannaAccessible->Role();
mGeckoAccessible = geckoAccessible;
mRole = geckoAccessible->Role();
}
return self;
@ -92,8 +92,8 @@ GetClosestInterestingAccessible(id anObject)
// unknown (either unimplemented, or irrelevant) elements are marked as ignored
// as well as expired elements.
return !mGoannaAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
!(mGoannaAccessible->InteractiveState() & states::FOCUSABLE));
return !mGeckoAccessible || ([[self role] isEqualToString:NSAccessibilityUnknownRole] &&
!(mGeckoAccessible->InteractiveState() & states::FOCUSABLE));
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
}
@ -103,7 +103,7 @@ GetClosestInterestingAccessible(id anObject)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSArray *generalAttributes = nil;
@ -141,7 +141,7 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
#if DEBUG
@ -183,9 +183,9 @@ GetClosestInterestingAccessible(id anObject)
if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
return [self title];
if ([attribute isEqualToString:NSAccessibilityTitleUIElementAttribute]) {
Relation rel = mGoannaAccessible->RelationByType(RelationType::LABELLED_BY);
Relation rel = mGeckoAccessible->RelationByType(RelationType::LABELLED_BY);
Accessible* tempAcc = rel.Next();
return tempAcc ? GetNativeFromGoannaAccessible(tempAcc) : nil;
return tempAcc ? GetNativeFromGeckoAccessible(tempAcc) : nil;
}
if ([attribute isEqualToString:NSAccessibilityHelpAttribute])
return [self help];
@ -227,23 +227,23 @@ GetClosestInterestingAccessible(id anObject)
- (id)accessibilityHitTest:(NSPoint)point
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
// Convert the given screen-global point in the cocoa coordinate system (with
// origin in the bottom-left corner of the screen) into point in the Goanna
// origin in the bottom-left corner of the screen) into point in the Gecko
// coordinate system (with origin in a top-left screen point).
NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];
NSPoint tmpPoint = NSMakePoint(point.x,
[mainView frame].size.height - point.y);
nsIntPoint goannaPoint = nsCocoaUtils::
nsIntPoint geckoPoint = nsCocoaUtils::
CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView));
Accessible* child = mGoannaAccessible->ChildAtPoint(goannaPoint.x, goannaPoint.y,
Accessible* child = mGeckoAccessible->ChildAtPoint(geckoPoint.x, geckoPoint.y,
Accessible::eDeepestChild);
if (child) {
mozAccessible* nativeChild = GetNativeFromGoannaAccessible(child);
mozAccessible* nativeChild = GetNativeFromGeckoAccessible(child);
if (nativeChild)
return GetClosestInterestingAccessible(nativeChild);
}
@ -270,12 +270,12 @@ GetClosestInterestingAccessible(id anObject)
- (id)accessibilityFocusedUIElement
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
Accessible* focusedGeckoChild = mGoannaAccessible->FocusedChild();
Accessible* focusedGeckoChild = mGeckoAccessible->FocusedChild();
if (focusedGeckoChild) {
mozAccessible *focusedChild = GetNativeFromGoannaAccessible(focusedGeckoChild);
mozAccessible *focusedChild = GetNativeFromGeckoAccessible(focusedGeckoChild);
if (focusedChild)
return GetClosestInterestingAccessible(focusedChild);
}
@ -290,9 +290,9 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
Accessible* accessibleParent = mGoannaAccessible->GetUnignoredParent();
Accessible* accessibleParent = mGeckoAccessible->GetUnignoredParent();
if (accessibleParent) {
id nativeParent = GetNativeFromGoannaAccessible(accessibleParent);
id nativeParent = GetNativeFromGeckoAccessible(accessibleParent);
if (nativeParent)
return GetClosestInterestingAccessible(nativeParent);
}
@ -303,7 +303,7 @@ GetClosestInterestingAccessible(id anObject)
//
// get the native root accessible, and tell it to return its first parent unignored accessible.
id nativeParent =
GetNativeFromGoannaAccessible(mGoannaAccessible->RootAccessible());
GetNativeFromGeckoAccessible(mGeckoAccessible->RootAccessible());
NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self);
return GetClosestInterestingAccessible(nativeParent);
@ -332,21 +332,21 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mChildren || !mGoannaAccessible->AreChildrenCached())
if (mChildren || !mGeckoAccessible->AreChildrenCached())
return mChildren;
mChildren = [[NSMutableArray alloc] init];
// get the array of children.
nsAutoTArray<Accessible*, 10> childrenArray;
mGoannaAccessible->GetUnignoredChildren(&childrenArray);
mGeckoAccessible->GetUnignoredChildren(&childrenArray);
// now iterate through the children array, and get each native accessible.
uint32_t totalCount = childrenArray.Length();
for (uint32_t idx = 0; idx < totalCount; idx++) {
Accessible* curAccessible = childrenArray.ElementAt(idx);
if (curAccessible) {
mozAccessible *curNative = GetNativeFromGoannaAccessible(curAccessible);
mozAccessible *curNative = GetNativeFromGeckoAccessible(curAccessible);
if (curNative)
[mChildren addObject:GetObjectOrRepresentedView(curNative)];
}
@ -370,10 +370,10 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIntRect rect = mGoannaAccessible->Bounds();
nsIntRect rect = mGeckoAccessible->Bounds();
NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];
CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mainView);
@ -389,10 +389,10 @@ GetClosestInterestingAccessible(id anObject)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIntRect rect = mGoannaAccessible->Bounds();
nsIntRect rect = mGeckoAccessible->Bounds();
CGFloat scaleFactor =
nsCocoaUtils::GetBackingScaleFactor([[NSScreen screens] objectAtIndex:0]);
return [NSValue valueWithSize:NSMakeSize(static_cast<CGFloat>(rect.width) / scaleFactor,
@ -403,11 +403,11 @@ GetClosestInterestingAccessible(id anObject)
- (NSString*)role
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
#ifdef DEBUG_A11Y
NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGoannaAccessible),
NS_ASSERTION(nsAccUtils::IsTextInterfaceSupportCorrect(mGeckoAccessible),
"Does not support Text when it should");
#endif
@ -427,7 +427,7 @@ GetClosestInterestingAccessible(id anObject)
- (NSString*)subrole
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsIAtom* landmark = mGeckoAccessible->LandmarkRole();
@ -457,7 +457,7 @@ GetClosestInterestingAccessible(id anObject)
return @"AXContentList"; // 10.6+ NSAccessibilityContentListSubrole;
case roles::ENTRY:
if (mGoannaAccessible->IsSearchbox())
if (mGeckoAccessible->IsSearchbox())
return @"AXSearchField";
break;
@ -528,7 +528,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString title;
mGoannaAccessible->Name(title);
mGeckoAccessible->Name(title);
return nsCocoaUtils::ToNSString(title);
NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
@ -539,7 +539,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString value;
mGoannaAccessible->Value(value);
mGeckoAccessible->Value(value);
return value.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast<const unichar*>(value.BeginReading())
length:value.Length()];
@ -568,11 +568,11 @@ struct RoleDescrComparator
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaAccessible->IsDefunct())
if (mGeckoAccessible->IsDefunct())
return nil;
nsAutoString desc;
mGoannaAccessible->Description(desc);
mGeckoAccessible->Description(desc);
return nsCocoaUtils::ToNSString(desc);
@ -584,7 +584,7 @@ struct RoleDescrComparator
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
nsAutoString helpText;
mGoannaAccessible->Help(helpText);
mGeckoAccessible->Help(helpText);
return helpText.IsEmpty() ? nil : [NSString stringWithCharacters:reinterpret_cast<const unichar*>(helpText.BeginReading())
length:helpText.Length()];
@ -603,26 +603,26 @@ struct RoleDescrComparator
- (BOOL)isFocused
{
return FocusMgr()->IsFocused(mGoannaAccessible);
return FocusMgr()->IsFocused(mGeckoAccessible);
}
- (BOOL)canBeFocused
{
return mGoannaAccessible && (mGoannaAccessible->InteractiveState() & states::FOCUSABLE);
return mGeckoAccessible && (mGeckoAccessible->InteractiveState() & states::FOCUSABLE);
}
- (BOOL)focus
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return NO;
mGoannaAccessible->TakeFocus();
mGeckoAccessible->TakeFocus();
return YES;
}
- (BOOL)isEnabled
{
return mGoannaAccessible && ((mGoannaAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
return mGeckoAccessible && ((mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
}
// The root accessible calls this when the focused node was
@ -645,7 +645,7 @@ struct RoleDescrComparator
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
AccessibleWrap* accWrap = static_cast<AccessibleWrap*>(mGoannaAccessible);
AccessibleWrap* accWrap = static_cast<AccessibleWrap*>(mGeckoAccessible);
// Get a pointer to the native window (NSWindow) we reside in.
NSWindow *nativeWindow = nil;
@ -676,7 +676,7 @@ struct RoleDescrComparator
if (!mChildren)
return;
mozAccessible *curNative = GetNativeFromGoannaAccessible(aAccessible);
mozAccessible *curNative = GetNativeFromGeckoAccessible(aAccessible);
if (curNative)
[mChildren addObject:GetObjectOrRepresentedView(curNative)];
}
@ -687,14 +687,14 @@ struct RoleDescrComparator
[self invalidateChildren];
mGoannaAccessible = nullptr;
mGeckoAccessible = nullptr;
NS_OBJC_END_TRY_ABORT_BLOCK;
}
- (BOOL)isExpired
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
#pragma mark -

@ -73,7 +73,7 @@ enum CheckboxValue {
- (BOOL)accessibilityIsIgnored
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
- (NSArray*)accessibilityActionNames
@ -118,12 +118,12 @@ enum CheckboxValue {
{
// both buttons and checkboxes have only one action. we should really stop using arbitrary
// arrays with actions, and define constants for these actions.
mGoannaAccessible->DoAction(0);
mGeckoAccessible->DoAction(0);
}
- (BOOL)isTab
{
return (mGoannaAccessible && (mGoannaAccessible->Role() == roles::PAGETAB));
return (mGeckoAccessible && (mGeckoAccessible->Role() == roles::PAGETAB));
}
@end
@ -148,7 +148,7 @@ enum CheckboxValue {
- (int)isChecked
{
uint64_t state = mGoannaAccessible->NativeState();
uint64_t state = mGeckoAccessible->NativeState();
// check if we're checked or in a mixed state
if (state & states::CHECKED) {
@ -292,10 +292,10 @@ enum CheckboxValue {
*/
- (id)value
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
Accessible* accessible = mGoannaAccessible->GetSelectedItem(0);
Accessible* accessible = mGeckoAccessible->GetSelectedItem(0);
if (!accessible)
return nil;
@ -339,33 +339,33 @@ enum CheckboxValue {
- (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return 0;
// By default this calls -[[mozAccessible children] count].
// Since we don't cache mChildren. This is faster.
if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
return mGoannaAccessible->ChildCount() ? 1 : 0;
return mGeckoAccessible->ChildCount() ? 1 : 0;
return [super accessibilityArrayAttributeCount:attribute];
}
- (NSArray*)children
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
nsDeckFrame* deckFrame = do_QueryFrame(mGoannaAccessible->GetFrame());
nsDeckFrame* deckFrame = do_QueryFrame(mGeckoAccessible->GetFrame());
nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr;
Accessible* selectedAcc = nullptr;
if (selectedFrame) {
nsINode* node = selectedFrame->GetContent();
selectedAcc = mGoannaAccessible->Document()->GetAccessible(node);
selectedAcc = mGeckoAccessible->Document()->GetAccessible(node);
}
if (selectedAcc) {
mozAccessible *curNative = GetNativeFromGoannaAccessible(selectedAcc);
mozAccessible *curNative = GetNativeFromGeckoAccessible(selectedAcc);
if (curNative)
return [NSArray arrayWithObjects:GetObjectOrRepresentedView(curNative), nil];
}

@ -33,7 +33,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
// standard attributes that are shared and supported by root accessible (AXMain) elements.
@ -95,7 +95,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible)
if (mParallelView)
return (id)mParallelView;
mParallelView = getNativeViewFromRootAccessible (mGoannaAccessible);
mParallelView = getNativeViewFromRootAccessible (mGeckoAccessible);
NSAssert(mParallelView, @"can't return root accessible's native parallel view.");
return mParallelView;

@ -20,17 +20,17 @@
mozilla::ErrorResult rv;
// XXX use the flattening API when there are available
// see bug 768298
mGoannaAccessible->GetContent()->GetTextContent(title, rv);
mGeckoAccessible->GetContent()->GetTextContent(title, rv);
return nsCocoaUtils::ToNSString(title);
}
- (id)value
{
if (!mGoannaAccessible || !mGoannaAccessible->IsHyperText())
if (!mGeckoAccessible || !mGeckoAccessible->IsHyperText())
return nil;
uint32_t level = mGoannaAccessible->AsHyperText()->GetLevelInternal();
uint32_t level = mGeckoAccessible->AsHyperText()->GetLevelInternal();
return [NSNumber numberWithInt:level];
}
@ -45,7 +45,7 @@
- (NSArray*)accessibilityAttributeNames
{
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSMutableArray* attributes = nil;
@ -69,7 +69,7 @@
- (NSArray*)accessibilityActionNames
{
// if we're expired, we don't support any attributes.
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return [NSArray array];
static NSArray* actionNames = nil;
@ -84,11 +84,11 @@
- (void)accessibilityPerformAction:(NSString*)action
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return;
if ([action isEqualToString:NSAccessibilityPressAction])
mGoannaAccessible->DoAction(0);
mGeckoAccessible->DoAction(0);
else
[super accessibilityPerformAction:action];
}
@ -105,11 +105,11 @@
- (NSURL*)url
{
if (!mGoannaAccessible || mGoannaAccessible->IsDefunct())
if (!mGeckoAccessible || mGeckoAccessible->IsDefunct())
return nil;
nsAutoString value;
mGoannaAccessible->Value(value);
mGeckoAccessible->Value(value);
NSString* urlString = value.IsEmpty() ? nil : nsCocoaUtils::ToNSString(value);
if (!urlString)

@ -8,9 +8,9 @@
@interface mozTextAccessible : mozAccessible
{
// both of these are the same old mGoannaAccessible, but already
// both of these are the same old mGeckoAccessible, but already
// QI'd for us, to the right type, for convenience.
mozilla::a11y::HyperTextAccessible* mGoannaTextAccessible; // strong
mozilla::a11y::HyperTextAccessible* mGeckoTextAccessible; // strong
}
@end

@ -58,7 +58,7 @@ ToNSString(id aValue)
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if ((self = [super initWithAccessible:accessible])) {
mGoannaTextAccessible = accessible->AsHyperText();
mGeckoTextAccessible = accessible->AsHyperText();
}
return self;
@ -67,7 +67,7 @@ ToNSString(id aValue)
- (BOOL)accessibilityIsIgnored
{
return !mGoannaAccessible;
return !mGeckoAccessible;
}
- (NSArray*)accessibilityAttributeNames
@ -127,10 +127,10 @@ ToNSString(id aValue)
}
if ([attribute isEqualToString:@"AXRequired"])
return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::REQUIRED)];
return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::REQUIRED)];
if ([attribute isEqualToString:@"AXInvalid"])
return [NSNumber numberWithBool:!!(mGoannaAccessible->State() & states::INVALID)];
return [NSNumber numberWithBool:!!(mGeckoAccessible->State() & states::INVALID)];
if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute])
return [self visibleCharacterRange];
@ -166,7 +166,7 @@ ToNSString(id aValue)
- (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
{
if (!mGoannaTextAccessible)
if (!mGeckoTextAccessible)
return nil;
if ([attribute isEqualToString:NSAccessibilityStringForRangeParameterizedAttribute]) {
@ -214,9 +214,9 @@ ToNSString(id aValue)
int32_t start = range.location;
int32_t end = start + range.length;
nsIntRect bounds = mGoannaTextAccessible->TextBounds(start, end);
nsIntRect bounds = mGeckoTextAccessible->TextBounds(start, end);
return [NSValue valueWithRect:nsCocoaUtils::GoannaRectToCocoaRect(bounds)];
return [NSValue valueWithRect:nsCocoaUtils::GeckoRectToCocoaRect(bounds)];
}
#if DEBUG
@ -247,7 +247,7 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
if (!mGoannaTextAccessible)
if (!mGeckoTextAccessible)
return;
if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
@ -262,12 +262,12 @@ ToNSString(id aValue)
return;
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGoannaTextAccessible->DeleteText(start, end - start);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->DeleteText(start, end - start);
nsString text;
nsCocoaUtils::GetStringForNSString(stringValue, text);
mGoannaTextAccessible->InsertText(text, start);
mGeckoTextAccessible->InsertText(text, start);
}
if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
@ -275,7 +275,7 @@ ToNSString(id aValue)
if (!ToNSRange(value, &range))
return;
mGoannaTextAccessible->SetSelectionBoundsAt(0, range.location,
mGeckoTextAccessible->SetSelectionBoundsAt(0, range.location,
range.location + range.length);
return;
}
@ -285,7 +285,7 @@ ToNSString(id aValue)
if (!ToNSRange(value, &range))
return;
mGoannaTextAccessible->ScrollSubstringTo(range.location, range.location + range.length,
mGeckoTextAccessible->ScrollSubstringTo(range.location, range.location + range.length,
nsIAccessibleScrollType::SCROLL_TYPE_TOP_EDGE);
return;
}
@ -307,7 +307,7 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
mGoannaTextAccessible = nullptr;
mGeckoTextAccessible = nullptr;
[super expire];
NS_OBJC_END_TRY_ABORT_BLOCK;
@ -322,8 +322,8 @@ ToNSString(id aValue)
if ([[self role] isEqualToString:NSAccessibilityStaticTextRole])
return YES;
if (mGoannaTextAccessible)
return (mGoannaAccessible->State() & states::READONLY) == 0;
if (mGeckoTextAccessible)
return (mGeckoAccessible->State() & states::READONLY) == 0;
return NO;
@ -332,8 +332,8 @@ ToNSString(id aValue)
- (NSNumber*)caretLineNumber
{
int32_t lineNumber = mGoannaTextAccessible ?
mGoannaTextAccessible->CaretLineNumber() - 1 : -1;
int32_t lineNumber = mGeckoTextAccessible ?
mGeckoTextAccessible->CaretLineNumber() - 1 : -1;
return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil;
}
@ -342,10 +342,10 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
nsString text;
nsCocoaUtils::GetStringForNSString(aNewString, text);
mGoannaTextAccessible->ReplaceText(text);
mGeckoTextAccessible->ReplaceText(text);
}
NS_OBJC_END_TRY_ABORT_BLOCK;
@ -353,7 +353,7 @@ ToNSString(id aValue)
- (NSString*)text
{
if (!mGoannaAccessible || !mGoannaTextAccessible)
if (!mGeckoAccessible || !mGeckoTextAccessible)
return nil;
// A password text field returns an empty value
@ -361,7 +361,7 @@ ToNSString(id aValue)
return @"";
nsAutoString text;
mGoannaTextAccessible->TextSubstring(0,
mGeckoTextAccessible->TextSubstring(0,
nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT,
text);
return nsCocoaUtils::ToNSString(text);
@ -371,10 +371,10 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
if (!mGoannaAccessible || !mGoannaTextAccessible)
if (!mGeckoAccessible || !mGeckoTextAccessible)
return 0;
return mGoannaTextAccessible ? mGoannaTextAccessible->CharacterCount() : 0;
return mGeckoTextAccessible ? mGeckoTextAccessible->CharacterCount() : 0;
NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
}
@ -383,9 +383,9 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
return (end - start);
}
return 0;
@ -397,12 +397,12 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0, end = 0;
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
if (start != end) {
nsAutoString selText;
mGoannaTextAccessible->TextSubstring(start, end, selText);
mGeckoTextAccessible->TextSubstring(start, end, selText);
return nsCocoaUtils::ToNSString(selText);
}
}
@ -415,17 +415,17 @@ ToNSString(id aValue)
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
if (mGoannaTextAccessible) {
if (mGeckoTextAccessible) {
int32_t start = 0;
int32_t end = 0;
int32_t count = mGoannaTextAccessible->SelectionCount();
int32_t count = mGeckoTextAccessible->SelectionCount();
if (count) {
mGoannaTextAccessible->SelectionBoundsAt(0, &start, &end);
mGeckoTextAccessible->SelectionBoundsAt(0, &start, &end);
return [NSValue valueWithRange:NSMakeRange(start, end - start)];
}
start = mGoannaTextAccessible->CaretOffset();
start = mGeckoTextAccessible->CaretOffset();
return [NSValue valueWithRange:NSMakeRange(start != -1 ? start : 0, 0)];
}
return [NSValue valueWithRange:NSMakeRange(0, 0)];
@ -438,8 +438,8 @@ ToNSString(id aValue)
// XXX this won't work with Textarea and such as we actually don't give
// the visible character range.
return [NSValue valueWithRange:
NSMakeRange(0, mGoannaTextAccessible ?
mGoannaTextAccessible->CharacterCount() : 0)];
NSMakeRange(0, mGeckoTextAccessible ?
mGeckoTextAccessible->CharacterCount() : 0)];
}
- (void)valueDidChange
@ -460,10 +460,10 @@ ToNSString(id aValue)
- (NSString*)stringFromRange:(NSRange*)range
{
NS_PRECONDITION(mGoannaTextAccessible && range, "no Goanna text accessible or range");
NS_PRECONDITION(mGeckoTextAccessible && range, "no Gecko text accessible or range");
nsAutoString text;
mGoannaTextAccessible->TextSubstring(range->location,
mGeckoTextAccessible->TextSubstring(range->location,
range->location + range->length, text);
return nsCocoaUtils::ToNSString(text);
}
@ -496,18 +496,18 @@ ToNSString(id aValue)
- (NSString*)text
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return nil;
return nsCocoaUtils::ToNSString(mGoannaAccessible->AsTextLeaf()->Text());
return nsCocoaUtils::ToNSString(mGeckoAccessible->AsTextLeaf()->Text());
}
- (long)textLength
{
if (!mGoannaAccessible)
if (!mGeckoAccessible)
return 0;
return mGoannaAccessible->AsTextLeaf()->Text().Length();
return mGeckoAccessible->AsTextLeaf()->Text().Length();
}
@end

@ -41,14 +41,14 @@
}
if (applicationName == "")
applicationName = "Goanna based application";
applicationName = "Gecko based application";
}
is (accessible.name, applicationName, "wrong application accessible name");
// nsIAccessibleApplication
is(accessible.appName, appInfo.name, "Wrong application name");
is(accessible.appVersion, appInfo.version, "Wrong application version");
is(accessible.platformName, "Goanna", "Wrong platform name");
is(accessible.platformName, "Gecko", "Wrong platform name");
is(accessible.platformVersion, appInfo.platformVersion,
"Wrong platform version");

@ -50,7 +50,7 @@
return;
// Note: always test against valuetext first because the existence of
// aria-valuetext takes precedence over aria-valuenow in goanna.
// aria-valuetext takes precedence over aria-valuenow in gecko.
is(acc.value, (aValuetext != undefined)? aValuetext : aValuenow,
"Wrong value of " + prettyName(aNodeOrID));
}

@ -169,8 +169,8 @@
<h6 id="head6">A heading level 6</h6>
<dl id="definitionlist">
<dt id="definitionterm">goanna</dt>
<dd id="definitiondescription">goannas have sticky toes</dd>
<dt id="definitionterm">gecko</dt>
<dd id="definitiondescription">geckos have sticky toes</dd>
</dl>
<span id="span1" onclick="">clickable span</span>

@ -368,7 +368,7 @@ ia2Accessible::get_states(AccessibleStates* aStates)
if (state & states::REQUIRED)
*aStates |= IA2_STATE_REQUIRED;
// The following IA2 states are not supported by Goanna
// The following IA2 states are not supported by Gecko
// IA2_STATE_ARMED
// IA2_STATE_MANAGES_DESCENDANTS
// IA2_STATE_ICONIFIED

@ -41,8 +41,8 @@ ia2AccessibleRelation::get_relationType(BSTR* aRelationType)
*aRelationType = nullptr;
#define RELATIONTYPE(goannaType, goannaTypeName, atkType, msaaType, ia2Type) \
case RelationType::goannaType: \
#define RELATIONTYPE(geckoType, geckoTypeName, atkType, msaaType, ia2Type) \
case RelationType::geckoType: \
*aRelationType = ::SysAllocString(ia2Type); \
break;

@ -64,13 +64,13 @@ private:
/**
* Goanna to IAccessible2 relation types map.
* Gecko to IAccessible2 relation types map.
*/
const WCHAR *const IA2_RELATION_NULL = L"";
#define RELATIONTYPE(goannaType, name, atkType, msaaType, ia2Type) \
std::pair<RelationType, const WCHAR *const>(RelationType::goannaType, ia2Type),
#define RELATIONTYPE(geckoType, name, atkType, msaaType, ia2Type) \
std::pair<RelationType, const WCHAR *const>(RelationType::geckoType, ia2Type),
static const std::pair<RelationType, const WCHAR *const> sRelationTypePairs[] = {
#include "RelationTypeMap.h"

@ -289,7 +289,7 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
@ -338,7 +338,7 @@ ia2AccessibleText::get_textAfterOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
textAcc->TextAfterOffset(aOffset, boundaryType, &startOffset, &endOffset, text);
@ -384,7 +384,7 @@ ia2AccessibleText::get_textAtOffset(long aOffset,
endOffset = textAcc->CharacterCount();
textAcc->TextSubstring(startOffset, endOffset, text);
} else {
AccessibleTextBoundary boundaryType = GetGoannaTextBoundary(aBoundaryType);
AccessibleTextBoundary boundaryType = GetGeckoTextBoundary(aBoundaryType);
if (boundaryType == -1)
return S_FALSE;
textAcc->TextAtOffset(aOffset, boundaryType, &startOffset, &endOffset, text);
@ -591,7 +591,7 @@ ia2AccessibleText::GetModifiedText(bool aGetInsertedText,
}
AccessibleTextBoundary
ia2AccessibleText::GetGoannaTextBoundary(enum IA2TextBoundaryType aBoundaryType)
ia2AccessibleText::GetGeckoTextBoundary(enum IA2TextBoundaryType aBoundaryType)
{
switch (aBoundaryType) {
case IA2_TEXT_BOUNDARY_CHAR:

@ -120,7 +120,7 @@ protected:
private:
HRESULT GetModifiedText(bool aGetInsertedText, IA2TextSegment *aNewText);
AccessibleTextBoundary GetGoannaTextBoundary(enum IA2TextBoundaryType coordinateType);
AccessibleTextBoundary GetGeckoTextBoundary(enum IA2TextBoundaryType coordinateType);
};
} // namespace a11y

@ -516,7 +516,7 @@ AccessibleWrap::get_accState(
// MSAA only has 31 states and the lowest 31 bits of